Skip to content
Permalink
Browse files
updates to build system:
 - build delimited text plugins.pro
 - set the plugin install path in the settings file
 - initial work on grass pro but disabled for now until I get grass in msys

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5996 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 22, 2006
1 parent baedebb commit df4430b6ed4e48716a7cdbc56b4e8c017a089601
Showing with 42 additions and 27 deletions.
  1. +3 −3 settings.pro
  2. +33 −12 src/plugins/delimited_text/delimited_text.pro
  3. +4 −11 src/plugins/plugins.pro
  4. +1 −0 src/providers/providers.pro
  5. +1 −1 src/src.pro
@@ -98,8 +98,8 @@ linux-g++:QGISLIBDIR=$${DESTDIR}/lib
macx:QGISLIBDIR=$${QGISBINDIR}
win32:QGISLIBDIR=$${DESTDIR}

QGISPLUGINDIR=$${QGISBINDIR}/plugins
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/plugins
QGISPLUGINDIR=$${DESTDIR}/lib/qgis
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis

QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
@@ -145,6 +145,7 @@ macx:GDALLIBADD=-framework gdal
SQLITELIBADD=-lsqlite3
PROJLIBADD=-lproj
GEOSLIBADD=-lgeos
GRASSLIBADD=-lgrass

win32:LIBS += -lWs2_32

@@ -231,4 +232,3 @@ linux-g++:OBJECTS_DIR = $${OBJDIR}/o/linux
win32:OBJECTS_DIR = $${OBJDIR}/o/win32
#These next two are not currently needed for this simple project
#RCC_DIR = $${OBJDIR}/rcc
#RC_FILE = $${APPNAME}.rc
@@ -1,18 +1,39 @@
####################################################################
# Qmake project file for QGIS top-level plugins directory
# This file is used by qmake to generate the Makefiles for building
# QGIS plugins on Windows
#################################################################
#
# delimited_text.pro,v 1.1 2004/06/23 04:15:54 gsherman 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.
#
#################################################################

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

include(../../../settings.pro)
TARGET=delimitedtextprovider
TEMPLATE = lib
INCLUDEPATH += . ..\..\src $(GDAL)\include
LIBS += $(GDAL)\lib\gdal_i.lib
DLLDESTDIR= ..\..\win_build\lib\qgis
CONFIG += qt dll thread
# Input
#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=$${QGISPLUGINDIR}
QT += qt3support svg core gui xml network
message("Building libs into $${DESTDIR}")

CONFIG += qt dll thread debug rtti
HEADERS += qgsdelimitedtextplugin.h \
qgsdelimitedtextplugingui.h
INTERFACES += qgsdelimitedtextpluginguibase.ui
FORMS += qgsdelimitedtextpluginguibase.ui
SOURCES += qgsdelimitedtextplugin.cpp \
qgsdelimitedtextplugingui.cpp
@@ -7,17 +7,10 @@
####################################################################

TEMPLATE = subdirs
SUBDIRS = delimited_text \
grid_maker \
copyright_label \
north_arrow \
gps_importer \
scale_bar \
spit
#SUBDIRS = copyright_label \
# delimited_text \
SUBDIRS = delimited_text
#\
# grid_maker \
# north_arrow \
# scale_bar \
# copyright_label \
# gps_importer \
# scale_bar \
# spit
@@ -11,3 +11,4 @@
#################################################################
TEMPLATE = subdirs
SUBDIRS = ogr delimitedtext
#grass
@@ -12,5 +12,5 @@

TEMPLATE=subdirs

SUBDIRS=core widgets gui providers
SUBDIRS=core widgets gui providers plugins

0 comments on commit df4430b

Please sign in to comment.