Windows build cross-compiling (from Linux) improvements:

* If postgres is not requested in the autogen/configure, do not attempt to build the geoprocessing and spit plugins (they have no meaning if postgres is not available). * Rearrange the acinclude (configure) test for the Qt version so that the Qt/Windows version is tested first. This resolves an issue when the Qt/Windows library is mounted on the linux compiler platform as smbfs, where case-insensitive matching was triggered; therefore allowing the Qt/Windows-style includes to be mis-detected as Qt/X11-style includes. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5830 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 16, 2006 · 058e811 · 058e811
1 parent 5d4c9b0
commit 058e811
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -153,17 +153,21 @@ AC_MSG_RESULT([$QTDIR])
 # TODO: Use sed instead of perl
 QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
 
-# Check for QT includedir 
-if test -f $QTDIR/include/qt/qglobal.h; then
+# Check for QT includedir
+
+# Test for the Windows version first because if if QTDIR is mounted via
+# smbfs to an actual Windows installation, the /include/Qt is found
+# case-insensitively
+if test -f $QTDIR/include/Qt/qglobal.h -a -f $QTDIR/src/corelib/global/qglobal.h; then
+  # Windows: $QTDIR/include/Qt/qglobal.h includes $QTDIR/src/corelib/global/qglobal.h
+  QTINC=$QTDIR/include
+  QTVERTEST=$QTDIR/src/corelib/global/
+elif test -f $QTDIR/include/qt/qglobal.h; then
   QTINC=$QTDIR/include/qt
   QTVERTEST=$QTDIR/include/qt
 elif test -f $QTDIR/include/qt4/Qt/qglobal.h; then
   QTINC=$QTDIR/include/qt4
   QTVERTEST=$QTDIR/include/qt4/Qt
-elif test -f $QTDIR/include/Qt/qglobal.h -a -f $QTDIR/src/corelib/global/qglobal.h; then
-  # Windows: $QTDIR/include/Qt/qglobal.h includes $QTDIR/src/corelib/global/qglobal.h
-  QTINC=$QTDIR/include
-  QTVERTEST=$QTDIR/src/corelib/global/
 elif test -f $QTDIR/include/Qt/qglobal.h; then
   QTINC=$QTDIR/include
   QTVERTEST=$QTDIR/include/Qt

diff --git a/src/Makefile.win b/src/Makefile.win
@@ -17,18 +17,21 @@ WINSUBDIRS = core legend raster composer \
 	providers/delimitedtext \
 	plugins/north_arrow \
 	plugins/copyright_label \
-	plugins/geoprocessing \
 	plugins/scale_bar \
 	plugins/georeferencer \
 	plugins/grid_maker \
 	plugins/delimited_text \
-	plugins/gps_importer \
-	plugins/spit 
-
+	plugins/gps_importer
+
+ifneq ($(PG_LIB),)
+    WINSUBDIRS += plugins/geoprocessing
+    WINSUBDIRS += plugins/spit
+endif
+
 ifneq ($(GRASS_BASE),)
     WINSUBDIRS += providers/grass plugins/grass
 endif
-	
+
 ifneq ($(PG_LIB),)
     WINSUBDIRS += providers/postgres
 endif