[avida-cvs] avida(Sherri) CVS commits: /current/source/main main.pro /current/source/qt-viewer qt-viewer.pro /current/source/viewers viewers.pro

[goingssh]

goingssh		Fri May 23 16:22:32 2003 EDT

  Modified files:              (Branch: Sherri)
    /avida/current/source/main	main.pro 
    /avida/current/source/qt-viewer	qt-viewer.pro 
    /avida/current/source/viewers	viewers.pro 
  Log:
  commiting updated pro files to my branch that makes the work directory be created and the executable placed there in windows
  
Index: avida/current/source/main/main.pro
diff -u avida/current/source/main/main.pro:1.2.2.1 avida/current/source/main/main.pro:1.2.2.2
--- avida/current/source/main/main.pro:1.2.2.1	Thu May 22 15:47:36 2003
+++ avida/current/source/main/main.pro	Fri May 23 16:22:30 2003
@@ -3,9 +3,11 @@
 
 TEMPLATE    = app
 TARGET      = primitive
+DESTDIR	= ../../work
 CONFIG      *= warn-on release
 CONFIG      *= cpu event main trio tools
 CONFIG	+= console
+OBJECTS_DIR  = objs
 
 include($$AVIDA_SRC_DIR/modules.pri)
 
Index: avida/current/source/qt-viewer/qt-viewer.pro
diff -u avida/current/source/qt-viewer/qt-viewer.pro:1.3 avida/current/source/qt-viewer/qt-viewer.pro:1.3.2.1
--- avida/current/source/qt-viewer/qt-viewer.pro:1.3	Tue May 20 07:22:30 2003
+++ avida/current/source/qt-viewer/qt-viewer.pro	Fri May 23 16:22:31 2003
@@ -3,11 +3,15 @@
 
 TEMPLATE    = app
 TARGET      = qt-viewer
+DESTDIR	= ../../work
 CONFIG      *= qt thread
 CONFIG      *= cpu event main trio tools
+CONFIG	+= console
 
-# setting MOC_DIR should not be necessary:
-MOC_DIR = .
+QMAKE_LFLAGS_CONSOLE += /FORCE:MULTIPLE
+
+OBJECTS_DIR = objs
+MOC_DIR 	= moc
 
 include($$AVIDA_SRC_DIR/modules.pri)
 
Index: avida/current/source/viewers/viewers.pro
diff -u avida/current/source/viewers/viewers.pro:1.2.2.1 avida/current/source/viewers/viewers.pro:1.2.2.2
--- avida/current/source/viewers/viewers.pro:1.2.2.1	Thu May 22 15:48:16 2003
+++ avida/current/source/viewers/viewers.pro	Fri May 23 16:22:31 2003
@@ -3,9 +3,11 @@
 
 TEMPLATE    = app
 TARGET      = ncurses-viewer
+DESTDIR	= ../../work
 CONFIG      *= warn-on
 CONFIG      *= cpu event main trio tools
 CONFIG	+= console
+OBJECTS_DIR	= objs
 !win32:LIBS += -lncurses
 else:LIBS	+= -l..\third-party\pdcurses\pdcurses
 include($$AVIDA_SRC_DIR/modules.pri)