Skip to content
Permalink
Browse files
Updates for windows build. Composer and projectionselector libs now b…
…uild.

git-svn-id: http://svn.osgeo.org/qgis/trunk@5978 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 20, 2006
1 parent 94fb639 commit 0f29d55a20a8d3ea85bdc476eee4ea2181217929
@@ -59,8 +59,11 @@ LANGUAGE = C++
CONFIG += exceptions
# Require that there are no undefined symbols in any libs!
QMAKE_LFLAGS_SHLIB *= --no-undefined
#clear all qt modules - each pro should specify exactly which qt modules it wants
QT =

QGSSVNVERSION=version0.8pre2
DEFINES += HAVE_POSTGRESQL=0
#################################################################
##
## Destination dir
@@ -112,7 +115,17 @@ message(QGISPLUGINDIR : $${QGISPLUGINDIR})

QGISCORELIBADD=-lqgis_core
CONFIG(debug, debug|release){
QGISCORELIBADD=$$member(QGISLIBADD, 0)-debug
QGISCORELIBADD=$$member(QGISCORELIBADD, 0)-debug
}

QGISPROJECTIONSELECTORLIBADD=-lqgis_projectionselector
CONFIG(debug, debug|release){
QGISPROJECTIONSELECTORLIBADD=$$member(QGISPROJECTIONSELECTORLIBADD, 0)-debug
}

QGISCOMPOSERLIBADD=-lqgis_composer
CONFIG(debug, debug|release){
QGISCOMPOSERLIBADD=$$member(QGISCOMPOSERLIBADD, 0)-debug
}

win32:GDALLIBADD=-lgdal
@@ -152,6 +165,8 @@ INCLUDEPATH +=$${WORKDIR}/src \
$${WORKDIR}/src/core \
$${WORKDIR}/src/gui \
$${WORKDIR}/src/legend \
$${WORKDIR}/src/composer \
$${WORKDIR}/src/widgets/projectionselector \
$${WORKDIR}/src/plugins \
$${WORKDIR}/src/providers \
$${WORKDIR}/src/raster \
@@ -0,0 +1,54 @@
#################################################################
#
# QMAKE Project File for Quantum GIS
#
# Tim Sutton 2006
#
# NOTE: Do not place any hard coded external paths in this file
# all libs and includes should be specified in settings.pro
# in the top level qgis directory.
#
#################################################################

#
# This file builds the gui library - the app is built in a separate pro file
#

include(../../settings.pro)
include(../ui/ui.pro)
TEMPLATE=lib
TARGET=qgis_composer
#suffix debug to target if applicable
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}
LIBS += $${GDALLIBADD}
LIBS += $${QGISCORELIBADD}
message("QGIS Core Lib: $${QGISCORELIBADD}")
message("LIBS: $${LIBS}")
DESTDIR=$${QGISLIBDIR}
#leave the next line here - it clears the Qt defines
QT =
QT += qt3support svg core gui
message("Building libs into $${DESTDIR}")

libqgis_composerHEADERS = qgscomposer.h \
qgscomposeritem.h \
qgscomposerlabel.h \
qgscomposerpicture.h \
qgscomposermap.h \
qgscomposerscalebar.h \
qgscomposervectorlegend.h \
qgscomposerview.h \
qgscomposition.h

libqgis_composer_la_SOURCES = qgscomposer.cpp \
qgscomposeritem.cpp \
qgscomposerlabel.cpp \
qgscomposerpicture.cpp \
qgscomposermap.cpp \
qgscomposerscalebar.cpp \
qgscomposervectorlegend.cpp \
qgscomposerview.cpp \
qgscomposition.cpp

@@ -25,9 +25,8 @@ LIBS += $${SQLITELIBADD}
LIBS += $${GEOSLIBADD}
LIBS += $${PROJLIBADD}
DESTDIR=$${QGISLIBDIR}
#leave the next line here - it clears the Qt defines
QT =
QT += network qt3support xml svg core gui
QT = $$unique(QT)
message("Building libs into $${DESTDIR}")

#AM_YFLAGS = -d
@@ -42,7 +41,6 @@ HEADERS = \
qgsclipper.h \
qgscolortable.h \
qgscontexthelp.h \
qgscsexception.h \
qgscustomsymbol.h \
qgscoordinatetransform.h \
qgsspatialrefsys.h \
@@ -82,12 +80,12 @@ HEADERS = \
qgsscalecalculator.h \
qgssearchstring.h \
qgssearchtreenode.h \
qgssinglesymrenderer.h \
qgssymbol.h \
qgssymbologyutils.h \
qgssearchstringparser.h \
qgsvectordataprovider.h

HEADERS = $$unique(HEADERS)

SOURCES =\
qgis.cpp \
@@ -140,6 +140,11 @@
#include <ApplicationServices/ApplicationServices.h>
#endif

//short term hack by Tim for windows to disable postgresql support
//#ifndef WIN32
#undef HAVE_POSTGRESQL
//#endif

#ifdef HAVE_POSTGRESQL
#include "qgsdbsourceselect.h"
#endif
@@ -28,6 +28,11 @@
#include "qgsuniquevaluedialog.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"

#ifdef WIN32
//temporary hack by Tim to disable pg on windows
#undef HAVE_POSTGRESQL
#endif
#ifdef HAVE_POSTGRESQL
#include "qgspgquerybuilder.h"
#include "../providers/postgres/qgspostgresprovider.h"
@@ -12,5 +12,5 @@

TEMPLATE=subdirs

SUBDIRS=core
SUBDIRS=core widgets gui

@@ -1,14 +1,32 @@
######################################################################
# Automatically generated by qmake (1.06c) Sat Apr 30 15:44:59 2005
######################################################################
#################################################################
#
# QMAKE Project File for Quantum GIS
#
# Tim Sutton 2006
#
# NOTE: Do not place any hard coded external paths in this file
# all libs and includes should be specified in settings.pro
# in the top level qgis directory.
#
#################################################################

TEMPLATE = lib
INCLUDEPATH += . \
..\..\src \
$(GDAL)\include \
$(SQLITE3)
include(../../../settings.pro)
TEMPLATE=lib
TARGET=qgis_projectionselector
#suffix debug to target if applicable
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}
LIBS += $${GDALLIBADD}
LIBS += $${SQLITELIBADD}
LIBS += $${PROJLIBADD}
LIBS += $${QGISCORELIBADD}
message("QGIS Core Lib: $${QGISCORELIBADD}")
message("LIBS: $${LIBS}")
DESTDIR=$${QGISLIBDIR}
QT += core gui qt3support
QT = $$unique(QT)

# Input
HEADERS += qgsprojectionselector.h qgsprojectionselectorbase.ui.h
INTERFACES += qgsprojectionselectorbase.ui
FORMS += qgsprojectionselectorbase.ui
HEADERS += qgsprojectionselector.h
SOURCES += qgsprojectionselector.cpp

0 comments on commit 0f29d55

Please sign in to comment.