Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added sources for pg support to win build
Link to libpg.dll in win now
Removed some ifdefs I had put in app and vectorlayer props to prevent pgis related stuff appearing in the gui

git-svn-id: http://svn.osgeo.org/qgis/trunk@6079 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 12, 2006
1 parent 7fefc14 commit e507f49
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
26 changes: 11 additions & 15 deletions src/gui/guilib.pro
Expand Up @@ -23,7 +23,7 @@ CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}
LIBS += $${GDALLIBADD}
#LIBS += $${SQLITELIBADD}
LIBS += $${POSTGRESLIBADD}
#LIBS += $${GEOSLIBADD}
#LIBS += $${PROJLIBADD}
LIBS += $${QGISCORELIBADD}
Expand Down Expand Up @@ -131,7 +131,11 @@ HEADERS = \
../composer/qgscomposerscalebar.h \
../composer/qgscomposervectorlegend.h \
../composer/qgscomposerview.h \
../composer/qgscomposition.h
../composer/qgscomposition.h \
qgsdbsourceselect.h \
qgsnewconnection.h \
qgspgquerybuilder.h \
qgspgutil.h #from pg lib

SOURCES = \
qgisapp.cpp \ # needed to ensure ui gets build for qgsiface
Expand Down Expand Up @@ -223,18 +227,10 @@ SOURCES = \
../composer/qgscomposerscalebar.cpp \
../composer/qgscomposervectorlegend.cpp \
../composer/qgscomposerview.cpp \
../composer/qgscomposition.cpp
../composer/qgscomposition.cpp \
qgsdbsourceselect.cpp \
qgsnewconnection.cpp \
qgspgquerybuilder.cpp \
qgspgutil.cpp # from pg lib


# Postgres specific compilation
# qgsdbsourceselect.h
#qgsnewconnection.h
#qgspgquerybuilder.h
#qgspgutil.h #from pg lib

#qgsdbsourceselect.cpp
#qgsnewconnection.cpp
#qgspgquerybuilder.cpp
#qgspgutil.cpp # from pg lib
#

2 changes: 0 additions & 2 deletions src/gui/qgisapp.cpp
Expand Up @@ -140,11 +140,9 @@
#include <ApplicationServices/ApplicationServices.h>
#endif

#ifndef WIN32
#ifdef HAVE_POSTGRESQL
#include "qgsdbsourceselect.h"
#endif
#endif

#ifndef WIN32
#include <dlfcn.h>
Expand Down
2 changes: 0 additions & 2 deletions src/gui/qgsvectorlayerproperties.cpp
Expand Up @@ -28,12 +28,10 @@
#include "qgsuniquevaluedialog.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
#ifndef WIN32
#ifdef HAVE_POSTGRESQL
#include "qgspgquerybuilder.h"
#include "../providers/postgres/qgspostgresprovider.h"
#endif
#endif

#include <QMessageBox>

Expand Down

0 comments on commit e507f49

Please sign in to comment.