Skip to content

Commit 3a440e1

Browse files
author
timlinux
committed
core builds with qmake under windows now (with some minor hacks)
git-svn-id: http://svn.osgeo.org/qgis/trunk@5973 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 26492c9 commit 3a440e1

File tree

2 files changed

+29
-61
lines changed

2 files changed

+29
-61
lines changed

settings.pro

Lines changed: 11 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ unix:WORKDIR=$$system(pwd)
1717
#a hack to get the current working dir under windows
1818
win32:WORKDIR=$$system(cd)
1919
message(Building in $${WORKDIR})
20-
QGIS_APP_NAME=omgui1
20+
QGIS_APP_NAME=qgis
2121
QGIS_LOCALPLUGIN=true
2222
QGIS_WEBSERVICESPLUGIN=false #disabled until renato gets it fully implemented
2323
QGIS_DUMMYPLUGIN=false
@@ -106,35 +106,28 @@ message(QGISPLUGINDIR : $${QGISPLUGINDIR})
106106

107107
#################################################################
108108
##
109-
## Library names
109+
## Libraries to link to (used on a case by case basis as needed)
110110
##
111111
#################################################################
112112

113-
QGISLIBADD=-lomgui
114-
QGISWIDGETSLIBADD=-lomgwidgets
115-
QGISSOAPLIBADD=-lomgsoap
116-
OPENMODELLERLIBADD=-lopenmodeller
113+
QGISCORELIBADD=-lqgis_core
117114
CONFIG(debug, debug|release){
118-
QGISLIBADD=$$member(QGISLIBADD, 0)-debug
119-
#win32:LIBS += -lomgui-debug$${VER_MAJ}
120-
QGISWIDGETSLIBADD=$$member(QGISWIDGETSLIBADD, 0)-debug
121-
QGISSOAPLIBADD=$$member(QGISSOAPLIBADD, 0)-debug
122-
win32:OPENMODELLERLIBADD=$$member(OPENMODELLERLIBADD, 0)-debug
115+
QGISCORELIBADD=$$member(QGISLIBADD, 0)-debug
123116
}
124-
win32:EXPATLIBADD=libexpat-1
125-
unix:EXPATLIBADD= #not needed for unix
117+
126118
win32:GDALLIBADD=-lgdal
127119
unix:GDALLIBADD=-lgdal
128120
macx:GDALLIBADD=-framework gdal
129121

130-
contains(QGIS_USE_QGIS,true){
131-
QGISLIBADD = -lqgis_core -lqgis_gui -lproj
132-
}
122+
SQLITELIBADD=-lsqlite3
123+
PROJLIBADD=-lproj
124+
GEOSLIBADD=-lgeos
133125

126+
win32:LIBS += -lWs2_32
134127

135128
#################################################################
136129
#
137-
# Lib search paths
130+
# Lib search paths (globally set for all pro files)
138131
#
139132
#################################################################
140133

@@ -150,7 +143,7 @@ macx:LIBS+=-L/usr/local/lib
150143

151144
#################################################################
152145
#
153-
# Include paths
146+
# Include paths (globally set for all pro files)
154147
#
155148
#################################################################
156149

@@ -202,44 +195,6 @@ macx{
202195
system(cp mac/Info.plist $${DESTDIR}/bin/$${QGIS_APP_NAME}.app/Contents)
203196
}
204197

205-
####################################################
206-
207-
208-
# Whether we should build the local om plugin
209-
contains(QGIS_LOCALPLUGIN,true){
210-
message("Building with omglocalplugin support")
211-
#make available as a c++ compiler macro
212-
DEFINES += WITH_LOCAL_PLUGIN
213-
}else {
214-
message("OmgLocalPlugin support disabled")
215-
}
216-
217-
####################################################
218-
219-
# Whether we should build the webservices om plugin
220-
contains(QGIS_WEBSERVICESPLUGIN,true){
221-
message("Building with omgwebservicesplugin support")
222-
#make available as a c++ compiler macro
223-
DEFINES += WITH_WEBSERVICES_PLUGIN
224-
}else{
225-
message("OmgWebServicesPlugin support disabled")
226-
#nullify soap lib include if WS is disabled
227-
QGISSOAPLIBADD=
228-
}
229-
230-
####################################################
231-
232-
233-
# Whether we should build with experimental/incomplete features
234-
# enabled on the GUI
235-
contains(QGIS_ALLOW_EXPERIMENTAL,false){
236-
message("Building with NO_EXPERIMENTAL features visible to user")
237-
#make available as a c++ compiler macro
238-
DEFINES += QGIS_NO_EXPERIMENTAL
239-
}else{
240-
message("EXPERIMENTAL features will be visible to user")
241-
}
242-
243198

244199
#################################################################
245200
#

src/core/core.pro

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,20 @@ CONFIG(debug, debug|release){
2121
TARGET = $$member(TARGET, 0)-debug
2222
}
2323
LIBS += $${GDALLIBADD}
24+
LIBS += $${SQLITELIBADD}
25+
LIBS += $${GEOSLIBADD}
26+
LIBS += $${PROJLIBADD}
2427
DESTDIR=$${QGISLIBDIR}
25-
QT += network qt3support xml svg
28+
#leave the next line here - it clears the Qt defines
29+
QT =
30+
QT += network qt3support xml svg core gui
2631
message("Building libs into $${DESTDIR}")
2732

2833
#AM_YFLAGS = -d
2934
#qgis_YACC = qgssearchstringparser.h
35+
#LEXSOURCES = qgssearchstringlexer.ll \
36+
# qgssearchstringparser.yy
37+
3038
HEADERS = \
3139
qgis.h \
3240
qgsapplication.h \
@@ -36,6 +44,8 @@ HEADERS = \
3644
qgscontexthelp.h \
3745
qgscsexception.h \
3846
qgscustomsymbol.h \
47+
qgscoordinatetransform.h \
48+
qgsspatialrefsys.h \
3949
qgsdatamanager.h \
4050
qgsdataprovider.h \
4151
qgsdatasource.h \
@@ -57,7 +67,6 @@ HEADERS = \
5767
qgsmarkersymbol.h \
5868
qgsnumericsortlistviewitem.h \
5969
qgspluginitem.h \
60-
qgspluginregistry.h \
6170
qgspoint.h \
6271
qgspolygonsymbol.h \
6372
qgsprojectproperty.h \
@@ -76,13 +85,16 @@ HEADERS = \
7685
qgssinglesymrenderer.h \
7786
qgssymbol.h \
7887
qgssymbologyutils.h \
88+
qgssearchstringparser.h \
7989
qgsvectordataprovider.h
8090

8191

8292
SOURCES =\
8393
qgis.cpp \
8494
qgsapplication.cpp \
8595
qgsbookmarkitem.cpp \
96+
qgscoordinatetransform.cpp \
97+
qgsspatialrefsys.cpp \
8698
qgsclipper.cpp \
8799
qgscolortable.cpp \
88100
qgscontexthelp.cpp \
@@ -106,7 +118,6 @@ SOURCES =\
106118
qgsmarkersymbol.cpp \
107119
qgsnumericsortlistviewitem.cpp \
108120
qgspluginitem.cpp \
109-
qgspluginregistry.cpp \
110121
qgspoint.cpp \
111122
qgspolygonsymbol.cpp \
112123
qgsprojectproperty.cpp \
@@ -121,11 +132,13 @@ SOURCES =\
121132
qgsrenderitem.cpp \
122133
qgsscalecalculator.cpp \
123134
qgssearchstring.cpp \
124-
qgssearchstringlexer.ll \
125-
qgssearchstringparser.yy \
126135
qgssearchtreenode.cpp \
127136
qgssymbol.cpp \
128137
qgssymbologyutils.cpp \
138+
qgssearchstringlexer.cc \
139+
qgssearchstringparser.cc \
129140
qgsvectordataprovider.cpp
130141

131142

143+
144+

0 commit comments

Comments
 (0)