[avida-cvs] avida CVS commits: /current/source/main Makefile.am /current/source/qt-viewer qt-viewer.pro

[kaben]

kaben		Wed Jun 11 20:46:41 2003 EDT

  Modified files:              
    /avida/current/source/main	Makefile.am 
    /avida/current/source/qt-viewer	qt-viewer.pro 
  Log:
  
  Fixed qt-viewer.pro bug: all platforms were configured for win32 build.
  
  
  
Index: avida/current/source/main/Makefile.am
diff -u avida/current/source/main/Makefile.am:1.27 avida/current/source/main/Makefile.am:1.28
--- avida/current/source/main/Makefile.am:1.27	Thu May 22 11:58:52 2003
+++ avida/current/source/main/Makefile.am	Wed Jun 11 20:46:39 2003
@@ -16,7 +16,7 @@
 #
 # don't know why it was needed.
 #
-AVIDA_EVENT_DIR = ../event
+AVIDA_EVENT_DIR = $(srcdir)/../event
 AVIDA_CPU_DIR = $(srcdir)/../cpu
 INCLUDES = -I$(AVIDA_EVENT_DIR) -I$(AVIDA_CPU_DIR)
 #
Index: avida/current/source/qt-viewer/qt-viewer.pro
diff -u avida/current/source/qt-viewer/qt-viewer.pro:1.6 avida/current/source/qt-viewer/qt-viewer.pro:1.7
--- avida/current/source/qt-viewer/qt-viewer.pro:1.6	Wed Jun  4 11:34:56 2003
+++ avida/current/source/qt-viewer/qt-viewer.pro	Wed Jun 11 20:46:40 2003
@@ -6,9 +6,13 @@
 DESTDIR	= ../../work
 CONFIG      *= qt thread
 CONFIG      *= cpu event main trio tools
-CONFIG	+= console
 
+# These must be conditional on platform type.  If they are active under
+# macx then the installation breaks.
+win32 {
+CONFIG	+= console
 QMAKE_LFLAGS_CONSOLE += /FORCE:MULTIPLE
+}
 
 OBJECTS_DIR = objs
 MOC_DIR 	= moc