Skip to content

Commit 83155cf

Browse files
author
timlinux
committed
Updates for windows build. Composer and projectionselector libs now build.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5978 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c00ea21 commit 83155cf

File tree

7 files changed

+112
-17
lines changed

7 files changed

+112
-17
lines changed

settings.pro

+16-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ LANGUAGE = C++
5959
CONFIG += exceptions
6060
# Require that there are no undefined symbols in any libs!
6161
QMAKE_LFLAGS_SHLIB *= --no-undefined
62+
#clear all qt modules - each pro should specify exactly which qt modules it wants
63+
QT =
6264

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

113116
QGISCORELIBADD=-lqgis_core
114117
CONFIG(debug, debug|release){
115-
QGISCORELIBADD=$$member(QGISLIBADD, 0)-debug
118+
QGISCORELIBADD=$$member(QGISCORELIBADD, 0)-debug
119+
}
120+
121+
QGISPROJECTIONSELECTORLIBADD=-lqgis_projectionselector
122+
CONFIG(debug, debug|release){
123+
QGISPROJECTIONSELECTORLIBADD=$$member(QGISPROJECTIONSELECTORLIBADD, 0)-debug
124+
}
125+
126+
QGISCOMPOSERLIBADD=-lqgis_composer
127+
CONFIG(debug, debug|release){
128+
QGISCOMPOSERLIBADD=$$member(QGISCOMPOSERLIBADD, 0)-debug
116129
}
117130

118131
win32:GDALLIBADD=-lgdal
@@ -152,6 +165,8 @@ INCLUDEPATH +=$${WORKDIR}/src \
152165
$${WORKDIR}/src/core \
153166
$${WORKDIR}/src/gui \
154167
$${WORKDIR}/src/legend \
168+
$${WORKDIR}/src/composer \
169+
$${WORKDIR}/src/widgets/projectionselector \
155170
$${WORKDIR}/src/plugins \
156171
$${WORKDIR}/src/providers \
157172
$${WORKDIR}/src/raster \

src/composer/composer.pro

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#################################################################
2+
#
3+
# QMAKE Project File for Quantum GIS
4+
#
5+
# Tim Sutton 2006
6+
#
7+
# NOTE: Do not place any hard coded external paths in this file
8+
# all libs and includes should be specified in settings.pro
9+
# in the top level qgis directory.
10+
#
11+
#################################################################
12+
13+
#
14+
# This file builds the gui library - the app is built in a separate pro file
15+
#
16+
17+
include(../../settings.pro)
18+
include(../ui/ui.pro)
19+
TEMPLATE=lib
20+
TARGET=qgis_composer
21+
#suffix debug to target if applicable
22+
CONFIG(debug, debug|release){
23+
TARGET = $$member(TARGET, 0)-debug
24+
}
25+
LIBS += $${GDALLIBADD}
26+
LIBS += $${QGISCORELIBADD}
27+
message("QGIS Core Lib: $${QGISCORELIBADD}")
28+
message("LIBS: $${LIBS}")
29+
DESTDIR=$${QGISLIBDIR}
30+
#leave the next line here - it clears the Qt defines
31+
QT =
32+
QT += qt3support svg core gui
33+
message("Building libs into $${DESTDIR}")
34+
35+
libqgis_composerHEADERS = qgscomposer.h \
36+
qgscomposeritem.h \
37+
qgscomposerlabel.h \
38+
qgscomposerpicture.h \
39+
qgscomposermap.h \
40+
qgscomposerscalebar.h \
41+
qgscomposervectorlegend.h \
42+
qgscomposerview.h \
43+
qgscomposition.h
44+
45+
libqgis_composer_la_SOURCES = qgscomposer.cpp \
46+
qgscomposeritem.cpp \
47+
qgscomposerlabel.cpp \
48+
qgscomposerpicture.cpp \
49+
qgscomposermap.cpp \
50+
qgscomposerscalebar.cpp \
51+
qgscomposervectorlegend.cpp \
52+
qgscomposerview.cpp \
53+
qgscomposition.cpp
54+

src/core/core.pro

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ LIBS += $${SQLITELIBADD}
2525
LIBS += $${GEOSLIBADD}
2626
LIBS += $${PROJLIBADD}
2727
DESTDIR=$${QGISLIBDIR}
28-
#leave the next line here - it clears the Qt defines
29-
QT =
3028
QT += network qt3support xml svg core gui
29+
QT = $$unique(QT)
3130
message("Building libs into $${DESTDIR}")
3231

3332
#AM_YFLAGS = -d
@@ -42,7 +41,6 @@ HEADERS = \
4241
qgsclipper.h \
4342
qgscolortable.h \
4443
qgscontexthelp.h \
45-
qgscsexception.h \
4644
qgscustomsymbol.h \
4745
qgscoordinatetransform.h \
4846
qgsspatialrefsys.h \
@@ -82,12 +80,12 @@ HEADERS = \
8280
qgsscalecalculator.h \
8381
qgssearchstring.h \
8482
qgssearchtreenode.h \
85-
qgssinglesymrenderer.h \
8683
qgssymbol.h \
8784
qgssymbologyutils.h \
8885
qgssearchstringparser.h \
8986
qgsvectordataprovider.h
9087

88+
HEADERS = $$unique(HEADERS)
9189

9290
SOURCES =\
9391
qgis.cpp \

src/gui/qgisapp.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@
140140
#include <ApplicationServices/ApplicationServices.h>
141141
#endif
142142

143+
//short term hack by Tim for windows to disable postgresql support
144+
//#ifndef WIN32
145+
#undef HAVE_POSTGRESQL
146+
//#endif
147+
143148
#ifdef HAVE_POSTGRESQL
144149
#include "qgsdbsourceselect.h"
145150
#endif

src/gui/qgsvectorlayerproperties.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
#include "qgsuniquevaluedialog.h"
2929
#include "qgsvectordataprovider.h"
3030
#include "qgsvectorlayer.h"
31+
32+
#ifdef WIN32
33+
//temporary hack by Tim to disable pg on windows
34+
#undef HAVE_POSTGRESQL
35+
#endif
3136
#ifdef HAVE_POSTGRESQL
3237
#include "qgspgquerybuilder.h"
3338
#include "../providers/postgres/qgspostgresprovider.h"

src/src.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212

1313
TEMPLATE=subdirs
1414

15-
SUBDIRS=core
15+
SUBDIRS=core widgets gui
1616

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

5-
TEMPLATE = lib
6-
INCLUDEPATH += . \
7-
..\..\src \
8-
$(GDAL)\include \
9-
$(SQLITE3)
13+
include(../../../settings.pro)
14+
TEMPLATE=lib
15+
TARGET=qgis_projectionselector
16+
#suffix debug to target if applicable
17+
CONFIG(debug, debug|release){
18+
TARGET = $$member(TARGET, 0)-debug
19+
}
20+
LIBS += $${GDALLIBADD}
21+
LIBS += $${SQLITELIBADD}
22+
LIBS += $${PROJLIBADD}
23+
LIBS += $${QGISCORELIBADD}
24+
message("QGIS Core Lib: $${QGISCORELIBADD}")
25+
message("LIBS: $${LIBS}")
26+
DESTDIR=$${QGISLIBDIR}
27+
QT += core gui qt3support
28+
QT = $$unique(QT)
1029

11-
# Input
12-
HEADERS += qgsprojectionselector.h qgsprojectionselectorbase.ui.h
13-
INTERFACES += qgsprojectionselectorbase.ui
30+
FORMS += qgsprojectionselectorbase.ui
31+
HEADERS += qgsprojectionselector.h
1432
SOURCES += qgsprojectionselector.cpp

0 commit comments

Comments
 (0)