Updates for building on win with qmake. Just need to sort out yy flax…

… stuff then I think core will build... git-svn-id: http://svn.osgeo.org/qgis/trunk@5967 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 17, 2006 · 5cdaba5 · 5cdaba5
1 parent 60ef2d6
commit 5cdaba5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 48 deletions.
diff --git a/qgis_win32.pro b/qgis_win32.pro
diff --git a/settings.pro b/settings.pro
@@ -14,7 +14,8 @@ message(******************** settings.pro ***********************)
 #################################################################
 
 unix:WORKDIR=$$system(pwd)
-win32:WORKDIR=c:/temp/
+#a hack to get the current working dir under windows
+win32:WORKDIR=$$system(cd)
 message(Building in $${WORKDIR})
 QGIS_APP_NAME=omgui1
 QGIS_LOCALPLUGIN=true
@@ -59,7 +60,7 @@ CONFIG += exceptions
 # Require that there are no undefined symbols in any libs!
 QMAKE_LFLAGS_SHLIB *= --no-undefined
 
-QGSSVNVERSION="version0.8pre2"
+QGSSVNVERSION=version0.8pre2
 #################################################################
 ##
 ## Destination dir
@@ -146,43 +147,22 @@ macx:LIBS+=-L$${QGISLIBDIR}
 macx:LIBS+=-F/Library/Frameworks/
 macx:LIBS+=-L/usr/local/lib
 
-contains(QGIS_USE_QGIS,true){
-  QT+= qt3support
-  #For mac we specify the path into a qgis.app bundle for the libs
-  #on other systems we will assume they are already in the path
-  macx:QGISDIR=/Users/timsutton/apps/qgis.app/Contents/MacOS/
-  linux-g++:QGISDIR=/home/timlinux/apps
-  #linux-g++:/usr
-  QGISLIBDIR=$${QGISDIR}/lib
-  LIBS+=-L$${QGISLIBDIR}
-
-  QGISPLUGINDIR=$${QGISLIBDIR}/qgis
-  DEFINES += QGISPLUGINDIR=$${QGISPLUGINDIR}
-  DEFINES += WITH_QGIS
-}
 
 #################################################################
 #
 # Include paths
 #
 #################################################################
 
-linux-g++:INCLUDEPATH += /usr/lib/ccache/include
-contains(QGIS_USE_QGIS,true){
-  macx:QGISSRCDIR=/Users/timsutton/dev/cpp/qgis/src
-  linux-g++:QGISSRCDIR=/home/timlinux/dev/cpp/qgis/src
-  win32:QGISSRCDIR=c:/dev/cpp/qgis/src
-
-  unix:INCLUDEPATH += $${QGISDIR}/include/qgis
-  win32:INCLUDEPATH += $${QGISSRCDIR}
-  win32:INCLUDEPATH += c:/msys/local/include
-  INCLUDEPATH +=$${QGISSRCDIR}/core \
-                $${QGISSRCDIR}/gui \
-                $${QGISSRCDIR}/plugins \
-                $${QGISSRCDIR}/providers \
-                $${QGISSRCDIR}/raster \
-                $${QGISSRCDIR}/ui 
-}
+win32:INCLUDEPATH += c:/msys/local/include
+INCLUDEPATH +=$${WORKDIR}/src \
+              $${WORKDIR}/src/core \
+              $${WORKDIR}/src/gui \
+              $${WORKDIR}/src/legend \
+              $${WORKDIR}/src/plugins \
+              $${WORKDIR}/src/providers \
+              $${WORKDIR}/src/raster \
+              $${WORKDIR}/src/ui 
 
 #################################################################
 #

diff --git a/src/core/core.pro b/src/core/core.pro
@@ -13,13 +13,16 @@
 include(../../settings.pro)
 TEMPLATE=lib
 TARGET=qgis_core
-system(echo $$QGSSVNVERSION > qgssvnversion.h)
+#need to figure out how to automate making qgssvnversion file
+#  line below doesnt work
+#system(echo $$QGSSVNVERSION >> qgssvnversion.h)
 #suffix debug to target if applicable
 CONFIG(debug, debug|release){
   TARGET = $$member(TARGET, 0)-debug
 }
 LIBS += $${GDALLIBADD}
 DESTDIR=$${QGISLIBDIR}
+QT += network qt3support xml svg
 message("Building libs into $${DESTDIR}")
 
 #AM_YFLAGS       = -d