Skip to content

Commit

Permalink
Windows build updates - includes patches submitted by godofredo contr…
Browse files Browse the repository at this point in the history
…eras

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6017 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 27, 2006
1 parent d4a841a commit 6812c87
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 21 deletions.
4 changes: 4 additions & 0 deletions README_windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ http://qgis.org/uploadfiles/mingw/msys.rar

and unpack to c:\msys

The file is compressed using rar - you can get a free windows application for creating and decompressing rar files here:

http://www.filzip.com/

Qt4.2:
-------------
Download qt4.2 opensource precompiled edition exe and install (including the
Expand Down
2 changes: 2 additions & 0 deletions settings.pro
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ INCLUDEPATH +=$${WORKDIR}/src \
$${WORKDIR}/src/plugins \
$${WORKDIR}/src/providers \
$${WORKDIR}/src/raster \
$${WORKDIR}/src/providers/wfs \
$${WORKDIR}/src/ui

#################################################################
Expand All @@ -192,6 +193,7 @@ win32{
message(Installing for windows!)
#add any win specific rules here
INCLUDEPATH += c:/msys/local/include
INCLUDEPATH += c:/msys/local/include/geos
}


Expand Down
48 changes: 30 additions & 18 deletions src/plugins/copyright_label/copyright_label.pro
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
####################################################################
# Qmake project file for QGIS plugin
# This file is used by qmake to generate the Makefiles for building
# the QGIS copyright plugin on Windows
#################################################################
#
# copyright_label.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 copyright label provider
#

include(../../../settings.pro)
TARGET=copyrightlabelprovider
TEMPLATE = lib
INCLUDEPATH += . ..\..\src \
$(GEOS)\include
LIBS += ..\..\src\libqgis.lib \
$(GDAL)\lib\gdal_i.lib \
$(GEOS)\lib\geos.lib \
$(POSTGRESQL)\src\interfaces\libpq\Release\libpq.lib
CONFIG += qt dll thread
DLLDESTDIR= ..\..\win_build\lib\qgis
#suffix debug to target if applicable
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}

LIBS += $${QGISCORELIBADD}
LIBS += $${QGISGUILIBADD}
DESTDIR=$${QGISPLUGINDIR}
QT += qt3support svg core gui xml network
message("Building libs into $${DESTDIR}")

# Input
CONFIG += qt dll thread debug rtti
HEADERS += plugin.h \
plugingui.h \
pluginguibase.ui.h
INTERFACES += pluginguibase.ui
plugingui.h
FORMS += pluginguibase.ui
SOURCES += plugin.cpp \
plugingui.cpp
5 changes: 3 additions & 2 deletions src/plugins/plugins.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
####################################################################

TEMPLATE = subdirs
SUBDIRS = delimited_text
SUBDIRS = delimited_text \
wfs \
copyright_label
#\
# grid_maker \
# copyright_label \
# gps_importer \
# scale_bar \
# spit
36 changes: 36 additions & 0 deletions src/plugins/wfs/wfs.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#################################################################
#
# 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 wfs plugin
#

include(../../../settings.pro)
TARGET=wfsplugin
TEMPLATE = lib
#suffix debug to target if applicable
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}

LIBS += $${QGISCORELIBADD}
LIBS += $${QGISGUILIBADD}
DESTDIR=$${QGISPLUGINDIR}
QT += qt3support svg core gui xml network
message("Building libs into $${DESTDIR}")

CONFIG += qt dll thread debug rtti
HEADERS += qgswfsplugin.h \
qgswfssourceselect.h
FORMS += qgswfssourceselectbase.ui
SOURCES += qgswfsplugin.cpp \
qgswfssourceselect.cpp
2 changes: 1 addition & 1 deletion src/providers/providers.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
#
#################################################################
TEMPLATE = subdirs
SUBDIRS = ogr delimitedtext
SUBDIRS = ogr delimitedtext wfs
#grass
34 changes: 34 additions & 0 deletions src/providers/wfs/wfs.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#################################################################
#
# 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 wfs provider
#

include(../../../settings.pro)
TARGET=wfsprovider
TEMPLATE = lib
#suffix debug to target if applicable
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}

LIBS += $${GEOSLIBADD}
LIBS += $${QGISCORELIBADD}

DESTDIR=$${QGISPROVIDERDIR}
QT += qt3support svg core gui xml network
message("Building libs into $${DESTDIR}")

CONFIG += qt dll thread debug rtti
HEADERS += qgswfsprovider.h
SOURCES += qgswfsprovider.cpp

0 comments on commit 6812c87

Please sign in to comment.