[avida-cvs] avida(kaben) CVS commits: /current configure.in /current/source/qt-viewer Makefile.am

[kaben]

kaben		Thu Oct 16 20:25:32 2003 EDT

  Modified files:              (Branch: kaben)
    /avida/current	configure.in 
    /avida/current/source/qt-viewer	Makefile.am 
  Log:
  
  Experimental support of command-line build of qt-viewer under cygwin
  using native win32 build tools (e.g. nmake).
  
  
  
Index: avida/current/configure.in
diff -u avida/current/configure.in:1.22.2.12 avida/current/configure.in:1.22.2.13
--- avida/current/configure.in:1.22.2.12	Thu Oct 16 07:18:20 2003
+++ avida/current/configure.in	Thu Oct 16 20:25:32 2003
@@ -168,6 +168,15 @@
 
 AM_CONDITIONAL(QT_VIEWER, test x$qt_viewer = xtrue)
 
+dnl experimental support for native win32 build of qt-viewer
+
+AC_ARG_ENABLE(experimental-win32-native,
+  [  --enable-experimental-win32-native: Use native win32 tools to build qt-viewer],
+  [exp_win32_native=true],
+  [exp_win32_native=false])
+AM_CONDITIONAL(EXP_WIN32_NATIVE, test x$exp_win32_native = xtrue)
+
+
 dnl installation
 AC_ARG_ENABLE(standard-prefix,
   [  --enable-standard-prefix: Switch off overriding of: prefix bindir datadir],
Index: avida/current/source/qt-viewer/Makefile.am
diff -u avida/current/source/qt-viewer/Makefile.am:1.44.2.13 avida/current/source/qt-viewer/Makefile.am:1.44.2.14
--- avida/current/source/qt-viewer/Makefile.am:1.44.2.13	Mon Oct 13 10:00:50 2003
+++ avida/current/source/qt-viewer/Makefile.am	Thu Oct 16 20:25:32 2003
@@ -15,20 +15,30 @@
 #QMAKE_OPTIONS+="CONFIG*=warn-off"
 #endif
 
+if EXP_WIN32_NATIVE
+QMAKE_OPTIONS+=-makefile -win32
+else
 QMAKE_OPTIONS+="AT_SRCDIR=$(srcdir)"
 QMAKE_OPTIONS+="AT_BINDIR=$(bindir)"
 #QMAKE_OPTIONS+="AT_HTMLDIR=$(HTMLDIR)"
 QMAKE_OPTIONS+="AT_DATADIR=$(datadir)"
 QMAKE_OPTIONS+="AT_PWD=`pwd`"
+endif
 
 qt-viewer.qmakefile: qt-viewer.pro Makefile.am
 	test x$(QMAKE) = x && (echo "can't continue; QMAKE unset."; exit 1) \
 	|| $(QMAKE) $(QMAKE_OPTIONS) -o $@ $<
 cPopulation_enums_auto.ci: $(srcdir)/../event/cPopulation.events
 	perl $(srcdir)/../event/make_events.pl $(<:%.events=%)
+
+if EXP_WIN32_NATIVE
+qt-viewer: qt-viewer.qmakefile cPopulation_enums_auto.ci FORCE
+	nmake -f qt-viewer.qmakefile
+else
 qt-viewer: qt-viewer.qmakefile cPopulation_enums_auto.ci FORCE
-	echo "srcdir: $(srcdir)"
 	${MAKE} -f qt-viewer.qmakefile
+endif
+
 .PHONY: FORCE
 
 mostlyclean-local: