Skip to content
Permalink
Browse files
core builds with qmake under windows now (with some minor hacks)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5973 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 19, 2006
1 parent 947abc0 commit 8ea06bd7fdcc33ceef52e658f6c978be8a51946a
Showing with 29 additions and 61 deletions.
  1. +11 −56 settings.pro
  2. +18 −5 src/core/core.pro
@@ -17,7 +17,7 @@ unix:WORKDIR=$$system(pwd)
#a hack to get the current working dir under windows
win32:WORKDIR=$$system(cd)
message(Building in $${WORKDIR})
QGIS_APP_NAME=omgui1
QGIS_APP_NAME=qgis
QGIS_LOCALPLUGIN=true
QGIS_WEBSERVICESPLUGIN=false #disabled until renato gets it fully implemented
QGIS_DUMMYPLUGIN=false
@@ -106,35 +106,28 @@ message(QGISPLUGINDIR : $${QGISPLUGINDIR})

#################################################################
##
## Library names
## Libraries to link to (used on a case by case basis as needed)
##
#################################################################

QGISLIBADD=-lomgui
QGISWIDGETSLIBADD=-lomgwidgets
QGISSOAPLIBADD=-lomgsoap
OPENMODELLERLIBADD=-lopenmodeller
QGISCORELIBADD=-lqgis_core
CONFIG(debug, debug|release){
QGISLIBADD=$$member(QGISLIBADD, 0)-debug
#win32:LIBS += -lomgui-debug$${VER_MAJ}
QGISWIDGETSLIBADD=$$member(QGISWIDGETSLIBADD, 0)-debug
QGISSOAPLIBADD=$$member(QGISSOAPLIBADD, 0)-debug
win32:OPENMODELLERLIBADD=$$member(OPENMODELLERLIBADD, 0)-debug
QGISCORELIBADD=$$member(QGISLIBADD, 0)-debug
}
win32:EXPATLIBADD=libexpat-1
unix:EXPATLIBADD= #not needed for unix

win32:GDALLIBADD=-lgdal
unix:GDALLIBADD=-lgdal
macx:GDALLIBADD=-framework gdal

contains(QGIS_USE_QGIS,true){
QGISLIBADD = -lqgis_core -lqgis_gui -lproj
}
SQLITELIBADD=-lsqlite3
PROJLIBADD=-lproj
GEOSLIBADD=-lgeos

win32:LIBS += -lWs2_32

#################################################################
#
# Lib search paths
# Lib search paths (globally set for all pro files)
#
#################################################################

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

#################################################################
#
# Include paths
# Include paths (globally set for all pro files)
#
#################################################################

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

####################################################


# Whether we should build the local om plugin
contains(QGIS_LOCALPLUGIN,true){
message("Building with omglocalplugin support")
#make available as a c++ compiler macro
DEFINES += WITH_LOCAL_PLUGIN
}else {
message("OmgLocalPlugin support disabled")
}

####################################################

# Whether we should build the webservices om plugin
contains(QGIS_WEBSERVICESPLUGIN,true){
message("Building with omgwebservicesplugin support")
#make available as a c++ compiler macro
DEFINES += WITH_WEBSERVICES_PLUGIN
}else{
message("OmgWebServicesPlugin support disabled")
#nullify soap lib include if WS is disabled
QGISSOAPLIBADD=
}

####################################################


# Whether we should build with experimental/incomplete features
# enabled on the GUI
contains(QGIS_ALLOW_EXPERIMENTAL,false){
message("Building with NO_EXPERIMENTAL features visible to user")
#make available as a c++ compiler macro
DEFINES += QGIS_NO_EXPERIMENTAL
}else{
message("EXPERIMENTAL features will be visible to user")
}


#################################################################
#
@@ -21,12 +21,20 @@ CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}
LIBS += $${GDALLIBADD}
LIBS += $${SQLITELIBADD}
LIBS += $${GEOSLIBADD}
LIBS += $${PROJLIBADD}
DESTDIR=$${QGISLIBDIR}
QT += network qt3support xml svg
#leave the next line here - it clears the Qt defines
QT =
QT += network qt3support xml svg core gui
message("Building libs into $${DESTDIR}")

#AM_YFLAGS = -d
#qgis_YACC = qgssearchstringparser.h
#LEXSOURCES = qgssearchstringlexer.ll \
# qgssearchstringparser.yy

HEADERS = \
qgis.h \
qgsapplication.h \
@@ -36,6 +44,8 @@ HEADERS = \
qgscontexthelp.h \
qgscsexception.h \
qgscustomsymbol.h \
qgscoordinatetransform.h \
qgsspatialrefsys.h \
qgsdatamanager.h \
qgsdataprovider.h \
qgsdatasource.h \
@@ -57,7 +67,6 @@ HEADERS = \
qgsmarkersymbol.h \
qgsnumericsortlistviewitem.h \
qgspluginitem.h \
qgspluginregistry.h \
qgspoint.h \
qgspolygonsymbol.h \
qgsprojectproperty.h \
@@ -76,13 +85,16 @@ HEADERS = \
qgssinglesymrenderer.h \
qgssymbol.h \
qgssymbologyutils.h \
qgssearchstringparser.h \
qgsvectordataprovider.h


SOURCES =\
qgis.cpp \
qgsapplication.cpp \
qgsbookmarkitem.cpp \
qgscoordinatetransform.cpp \
qgsspatialrefsys.cpp \
qgsclipper.cpp \
qgscolortable.cpp \
qgscontexthelp.cpp \
@@ -106,7 +118,6 @@ SOURCES =\
qgsmarkersymbol.cpp \
qgsnumericsortlistviewitem.cpp \
qgspluginitem.cpp \
qgspluginregistry.cpp \
qgspoint.cpp \
qgspolygonsymbol.cpp \
qgsprojectproperty.cpp \
@@ -121,11 +132,13 @@ SOURCES =\
qgsrenderitem.cpp \
qgsscalecalculator.cpp \
qgssearchstring.cpp \
qgssearchstringlexer.ll \
qgssearchstringparser.yy \
qgssearchtreenode.cpp \
qgssymbol.cpp \
qgssymbologyutils.cpp \
qgssearchstringlexer.cc \
qgssearchstringparser.cc \
qgsvectordataprovider.cpp




0 comments on commit 8ea06bd

Please sign in to comment.