Skip to content

Commit 7fefc14

Browse files
author
timlinux
committed
Postgres provider now builds under native win qmake build
git-svn-id: http://svn.osgeo.org/qgis/trunk@6078 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 01f9755 commit 7fefc14

File tree

2 files changed

+33
-25
lines changed

2 files changed

+33
-25
lines changed

src/providers/postgres/postgres.pro

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
1-
######################################################################
2-
# Qmake project file for building the postgres provider.
3-
# This file is needed for building on Windows
4-
######################################################################
5-
# postgres.pro,v 1.2 2004/06/23 04:15:55 gsherman Exp
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+
#################################################################
612

13+
#
14+
# This file builds the gui library - the app is built in a separate pro file
15+
#
16+
17+
include(../../../settings.pro)
18+
TARGET=postgresprovider
719
TEMPLATE = lib
8-
INCLUDEPATH += . \
9-
..\..\src \
10-
$(POSTGRESQL)\src\interfaces\libpq \
11-
$(POSTGRESQL)\src\include \
12-
$(GEOS)\include \
13-
$(GDAL)\include \
14-
$(WINSDK)\include
15-
LIBS += $(POSTGRESQL)\src\interfaces\libpq\Release\libpq.lib \
16-
..\..\src\libqgis.lib \
17-
$(GEOS)\lib\geos.lib \
18-
$(FWTOOLS)\lib\gdal_i.lib
20+
#suffix debug to target if applicable
21+
CONFIG(debug, debug|release){
22+
TARGET = $$member(TARGET, 0)-debug
23+
}
24+
LIBS += $${GDALLIBADD}
25+
LIBS += $${GEOSLIBADD}
26+
LIBS += $${POSTGRESLIBADD}
27+
LIBS += $${QGISCORELIBADD}
28+
LIBS += $${QGISGUILIBADD}
29+
LIBS += $${QGISPROJECTIONSELECTORLIBADD}
30+
DESTDIR=$${QGISPROVIDERDIR}
31+
QT += qt3support svg core gui xml network
32+
message("Building libs into $${DESTDIR}")
33+
34+
CONFIG += qt dll thread debug rtti
1935

20-
CONFIG += qt dll thread
21-
DLLDESTDIR= ..\..\win_build\lib\qgis
22-
# Input
2336
HEADERS += qgspostgresprovider.h \
2437
qgspostgrescountthread.h \
2538
qgspostgisbox2d.h \
@@ -32,8 +45,3 @@ SOURCES += qgspostgresprovider.cpp \
3245
qgspostgisbox2d.cpp \
3346
qgspostgisbox3d.cpp \
3447
qgspostgresextentthread.cpp \
35-
..\..\src\qgsfeature.cpp \
36-
..\..\src\qgsfield.cpp \
37-
..\..\src\qgsrect.cpp \
38-
..\..\src\qgsfeatureattribute.cpp \
39-
..\..\src\qgspoint.cpp

src/providers/providers.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
#
1111
#################################################################
1212
TEMPLATE = subdirs
13-
SUBDIRS = ogr delimitedtext grass
13+
SUBDIRS = ogr delimitedtext grass postgres

0 commit comments

Comments
 (0)