Build improvements - org provider now builds

git-svn-id: http://svn.osgeo.org/qgis/trunk@5989 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 21, 2006 · df7fe96 · df7fe96
1 parent 02dc16d
commit df7fe96
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 45 deletions.
diff --git a/src/providers/ogr/ogr.pro b/src/providers/ogr/ogr.pro
@@ -1,39 +1,36 @@
-####################################################################
-# Qmake project file for QGIS data provider
-# This file is used by qmake to generate the Makefile for building
-# the QGIS OGR data provider on Windows
+#################################################################
 #
-# ogr.pro,v 1.2 2004/08/14 01:10:09 timlinux Exp
-####################################################################
+#         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.
+# 
+#################################################################
 
-################# 
-# GEOS Notes    #
-##########################################################################
-# Geos support is currenlty provided by a custom compiled library.
-# The library is compiled with vc++ and statically linked with the
-# ogr provider. A dll may be supplied at a later date. GEOS source
-# used in creating the library is available at geos.refractions.net.
-# To compile the windows version, set the GEOS environment variable
-# to point to the directory containing the include and lib subdirectories.
-# The headers/lib can be downloaded from http://qgis.org/win32_geos.zip
-###########################################################################
+#
+# This file builds the gui library - the app is built in a separate pro file
+#
 
+include(../../../settings.pro)
+TARGET=ogrprovider
 TEMPLATE = lib
-INCLUDEPATH += . $(GDAL)\include \
-                $(GEOS)\include \
-                $(QTDIR)\include
-LIBS += $(GDAL)\lib\gdal_i.lib \
-                ..\..\src\libqgis.lib \
-                $(GEOS)\lib\geos.lib
+#suffix debug to target if applicable
+CONFIG(debug, debug|release){
+  TARGET = $$member(TARGET, 0)-debug
+}
+LIBS += $${GDALLIBADD}
+LIBS += $${GEOSLIBADD}
+#LIBS += $${PROJLIBADD}
+LIBS += $${QGISCORELIBADD}
+LIBS += $${QGISGUILIBADD}
+LIBS += $${QGISPROJECTIONSELECTORLIBADD}
+DESTDIR=$${QGISPROVIDERDIR}
+QT += qt3support svg core gui xml network
+message("Building libs into $${DESTDIR}")
+
 CONFIG += qt dll thread debug rtti
-#CONFIG += qt dll thread rtti
-DLLDESTDIR= ..\..\win_build\lib\qgis
-#DEFINES += NOWIN32GEOS
-# Input
-HEADERS += qgsshapefileprovider.h
-SOURCES += qgsshapefileprovider.cpp \
-           ..\..\src\qgsfeature.cpp \
-           ..\..\src\qgsfield.cpp \
-           ..\..\src\qgsrect.cpp \
-           ..\..\src\qgsfeatureattribute.cpp \
-           ..\..\src\qgspoint.cpp
+HEADERS += qgsogrprovider.h
+SOURCES += qgsogrprovider.cpp 
diff --git a/src/providers/providers.pro b/src/providers/providers.pro
@@ -1,12 +1,13 @@
-######################################################################
-# Qmake project file for QGIS providers directory
-# This file is used by qmake to generate the Makefile for building
-# QGIS on Windows
+#################################################################
 #
-# $Id $ 
-######################################################################
+#         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 = subdirs
-SUBDIRS =  delimitedtext \
-           ogr \
-           postgres \
-	   gpx
+SUBDIRS =  ogr 
diff --git a/src/src.pro b/src/src.pro
@@ -12,5 +12,5 @@
 
 TEMPLATE=subdirs
 
-SUBDIRS=core widgets gui
+SUBDIRS=core widgets gui providers