Skip to content

Commit 5cdaba5

Browse files
author
timlinux
committedOct 17, 2006
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
1 parent 60ef2d6 commit 5cdaba5

File tree

3 files changed

+16
-48
lines changed

3 files changed

+16
-48
lines changed
 

‎qgis_win32.pro

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎settings.pro

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ message(******************** settings.pro ***********************)
1414
#################################################################
1515

1616
unix:WORKDIR=$$system(pwd)
17-
win32:WORKDIR=c:/temp/
17+
#a hack to get the current working dir under windows
18+
win32:WORKDIR=$$system(cd)
1819
message(Building in $${WORKDIR})
1920
QGIS_APP_NAME=omgui1
2021
QGIS_LOCALPLUGIN=true
@@ -59,7 +60,7 @@ CONFIG += exceptions
5960
# Require that there are no undefined symbols in any libs!
6061
QMAKE_LFLAGS_SHLIB *= --no-undefined
6162

62-
QGSSVNVERSION="version0.8pre2"
63+
QGSSVNVERSION=version0.8pre2
6364
#################################################################
6465
##
6566
## Destination dir
@@ -146,43 +147,22 @@ macx:LIBS+=-L$${QGISLIBDIR}
146147
macx:LIBS+=-F/Library/Frameworks/
147148
macx:LIBS+=-L/usr/local/lib
148149

149-
contains(QGIS_USE_QGIS,true){
150-
QT+= qt3support
151-
#For mac we specify the path into a qgis.app bundle for the libs
152-
#on other systems we will assume they are already in the path
153-
macx:QGISDIR=/Users/timsutton/apps/qgis.app/Contents/MacOS/
154-
linux-g++:QGISDIR=/home/timlinux/apps
155-
#linux-g++:/usr
156-
QGISLIBDIR=$${QGISDIR}/lib
157-
LIBS+=-L$${QGISLIBDIR}
158-
159-
QGISPLUGINDIR=$${QGISLIBDIR}/qgis
160-
DEFINES += QGISPLUGINDIR=$${QGISPLUGINDIR}
161-
DEFINES += WITH_QGIS
162-
}
163150

164151
#################################################################
165152
#
166153
# Include paths
167154
#
168155
#################################################################
169156

170-
linux-g++:INCLUDEPATH += /usr/lib/ccache/include
171-
contains(QGIS_USE_QGIS,true){
172-
macx:QGISSRCDIR=/Users/timsutton/dev/cpp/qgis/src
173-
linux-g++:QGISSRCDIR=/home/timlinux/dev/cpp/qgis/src
174-
win32:QGISSRCDIR=c:/dev/cpp/qgis/src
175-
176-
unix:INCLUDEPATH += $${QGISDIR}/include/qgis
177-
win32:INCLUDEPATH += $${QGISSRCDIR}
178-
win32:INCLUDEPATH += c:/msys/local/include
179-
INCLUDEPATH +=$${QGISSRCDIR}/core \
180-
$${QGISSRCDIR}/gui \
181-
$${QGISSRCDIR}/plugins \
182-
$${QGISSRCDIR}/providers \
183-
$${QGISSRCDIR}/raster \
184-
$${QGISSRCDIR}/ui
185-
}
157+
win32:INCLUDEPATH += c:/msys/local/include
158+
INCLUDEPATH +=$${WORKDIR}/src \
159+
$${WORKDIR}/src/core \
160+
$${WORKDIR}/src/gui \
161+
$${WORKDIR}/src/legend \
162+
$${WORKDIR}/src/plugins \
163+
$${WORKDIR}/src/providers \
164+
$${WORKDIR}/src/raster \
165+
$${WORKDIR}/src/ui
186166

187167
#################################################################
188168
#

‎src/core/core.pro

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
include(../../settings.pro)
1414
TEMPLATE=lib
1515
TARGET=qgis_core
16-
system(echo $$QGSSVNVERSION > qgssvnversion.h)
16+
#need to figure out how to automate making qgssvnversion file
17+
# line below doesnt work
18+
#system(echo $$QGSSVNVERSION >> qgssvnversion.h)
1719
#suffix debug to target if applicable
1820
CONFIG(debug, debug|release){
1921
TARGET = $$member(TARGET, 0)-debug
2022
}
2123
LIBS += $${GDALLIBADD}
2224
DESTDIR=$${QGISLIBDIR}
25+
QT += network qt3support xml svg
2326
message("Building libs into $${DESTDIR}")
2427

2528
#AM_YFLAGS = -d

0 commit comments

Comments
 (0)
Please sign in to comment.