Skip to content
Permalink
Browse files
Changes related to windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5556 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Jul 1, 2006
1 parent 46af42a commit 3d6a8827a7f3c6b627f6443aba8c56cafe8c94a6
Showing with 32 additions and 9 deletions.
  1. +5 −3 Makefile.win
  2. +17 −3 src/Makefile.win
  3. +4 −1 src/plugins/grid_maker/Makefile.am
  4. +3 −1 src/plugins/grid_maker/main.cpp
  5. +3 −1 src/plugins/spit/Makefile.am
@@ -13,9 +13,9 @@ install: all
# Copy GRASS to QGIS
cpgrass:
mkdir -p -m 755 $(prefix)/grass/docs
cp $(GRASS_BASE)/COPYING $(prefix)/grass
cp $(GRASS_BASE)/AUTHORS $(prefix)/grass
cp $(GRASS_BASE)/README $(prefix)/grass
# cp $(GRASS_BASE)/COPYING $(prefix)/grass
# cp $(GRASS_BASE)/AUTHORS $(prefix)/grass
# cp $(GRASS_BASE)/README $(prefix)/grass
cp -r $(GRASS_BASE)/etc $(prefix)/grass
cp -r $(GRASS_BASE)/driver $(prefix)/grass
cp -r $(GRASS_BASE)/bin $(prefix)/grass
@@ -54,6 +54,8 @@ pkg:
@ echo "Creating binary package $(BINPKG)"
mkdir -p -m 755 $(BINPKG)
cp -r $(prefix)/* $(BINPKG)
(cd $(BINPKG); rm -fr grass-6.1.cvs include)

zip -r $(BINPKG).zip $(BINPKG)


@@ -7,9 +7,23 @@ STDSUBDIRS = core ui legend raster composer widgets helpviewer

WINSUBDIRS = core legend raster composer \
widgets/projectionselector gui \
providers/ogr providers/grass providers/wms \
providers/ogr \
providers/grass \
providers/wms \
providers/postgres \
plugins/grass
providers/gpx \
providers/delimitedtext \
plugins/grass \
plugins/north_arrow \
plugins/copyright_label \
plugins/geoprocessing \
plugins/scale_bar \
plugins/georeferencer \
plugins/grid_maker \
plugins/delimited_text
plugins/gps_importer \
plugins/spit


all: stdsubdirs guilib winsubdirs

@@ -19,7 +33,7 @@ guilib:
install: all
@list='$(WINSUBDIRS)'; \
for subdir in $$list; do \
echo $$subdir ; \
echo !!!!!!!!!!!!!!!!!!!! $$subdir !!!!!!!!!!!!!!!!!!!!; \
$(MAKE) -C $$subdir -f Makefile.win install || exit 1 ; \
done

@@ -19,8 +19,11 @@ plugindir = ${pkglibdir}
#for plugin so
plugin_LTLIBRARIES = gridmakerplugin.la

#for standalon executable
# For standalone executable
# don't build on mingw since we haven't figured out the makefile issues
if MINGW_FALSE
bin_PROGRAMS = gridmaker
endif

%.moc.cpp: %.h
$(MOC) -o $@ $<
@@ -8,13 +8,15 @@
#include <qapplication.h>
#include <qtextcodec.h>
#include <qtranslator.h>
#include <QString>

int main(int argc, char *argv[])
{
QApplication a(argc, argv);

#if defined(Q_OS_MACX) || defined(WIN32)
QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
// XXX Is the PKGDATAPATH setting below needed under Qt 4.x?
// PKGDATAPATH = QString(qApp->applicationDirPath() + "/share/qgis");
#endif

/* Load translationfile */
@@ -13,7 +13,9 @@
plugindir = ${pkglibdir}

plugin_LTLIBRARIES = spitplugin.la
if MINGW_FALSE
bin_PROGRAMS = spit
endif


%.moc.cpp: %.h
@@ -76,7 +78,7 @@ BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)

spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../core/libqgis_core.la
spitplugin_la_LDFLAGS = -avoid-version -module
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../gui -I../../ui -I../../core
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../gui -I../../ui -I../../core


spit_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD)

0 comments on commit 3d6a882

Please sign in to comment.