@@ -17,7 +17,7 @@ unix:WORKDIR=$$system(pwd)
17
17
# a hack to get the current working dir under windows
18
18
win32 :WORKDIR =$$system (cd )
19
19
message (Building in $${WORKDIR} )
20
- QGIS_APP_NAME =omgui1
20
+ QGIS_APP_NAME =qgis
21
21
QGIS_LOCALPLUGIN =true
22
22
QGIS_WEBSERVICESPLUGIN =false # disabled until renato gets it fully implemented
23
23
QGIS_DUMMYPLUGIN =false
@@ -106,35 +106,28 @@ message(QGISPLUGINDIR : $${QGISPLUGINDIR})
106
106
107
107
# ################################################################
108
108
# #
109
- # # Library names
109
+ # # Libraries to link to (used on a case by case basis as needed)
110
110
# #
111
111
# ################################################################
112
112
113
- QGISLIBADD =-lomgui
114
- QGISWIDGETSLIBADD =-lomgwidgets
115
- QGISSOAPLIBADD =-lomgsoap
116
- OPENMODELLERLIBADD =-lopenmodeller
113
+ QGISCORELIBADD =-lqgis_core
117
114
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
123
116
}
124
- win32 :EXPATLIBADD =libexpat-1
125
- unix :EXPATLIBADD = # not needed for unix
117
+
126
118
win32 :GDALLIBADD =-lgdal
127
119
unix :GDALLIBADD =-lgdal
128
120
macx:GDALLIBADD =-framework gdal
129
121
130
- contains ( QGIS_USE_QGIS,true ){
131
- QGISLIBADD = -lqgis_core -lqgis_gui -lproj
132
- }
122
+ SQLITELIBADD = -lsqlite3
123
+ PROJLIBADD = -lproj
124
+ GEOSLIBADD = -lgeos
133
125
126
+ win32 :LIBS += -lWs2_32
134
127
135
128
# ################################################################
136
129
#
137
- # Lib search paths
130
+ # Lib search paths (globally set for all pro files)
138
131
#
139
132
# ################################################################
140
133
@@ -150,7 +143,7 @@ macx:LIBS+=-L/usr/local/lib
150
143
151
144
# ################################################################
152
145
#
153
- # Include paths
146
+ # Include paths (globally set for all pro files)
154
147
#
155
148
# ################################################################
156
149
@@ -202,44 +195,6 @@ macx{
202
195
system (cp mac/Info.plist $${DESTDIR}/bin/$${QGIS_APP_NAME}.app/Contents )
203
196
}
204
197
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
-
243
198
244
199
# ################################################################
245
200
#
0 commit comments