Win32 build fixes

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 17c04a603b300a3fc615e724ce83e2646802d71b..b41ca0989f8431cc51b4b772ac0970468986c7da 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,30 +37,36 @@ libgis_la_SOURCES = gis.h \
        roam.c        roam.h        \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       -DPKGDATADIR="\"$(datadir)/gis\"" \
-       -DPLUGINSDIR="\"$(libdir)/gis\""
+       -DPKGDATADIR="\"$(dots)$(datadir)/gis\"" \
+       -DPLUGINSDIR="\"$(dots)$(libdir)/gis\""
 libgis_la_LIBADD  = $(AM_LDADD) \
        objects/libgis-objects.la \
        data/libgis-data.la
 
 # Demo program
-if NOTWIN32
-AM_LDFLAGS += -static
+if WIN32
+AM_LDFLAGS += -mwindows
+dots        = ..
+else
+BINLDFLAGS  = -static
 endif
 
 bin_PROGRAMS = gis-demo
 
 gis_demo_SOURCES  = gis-demo.c
 gis_demo_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_LDFLAGS  = $(BINLDFLAGS)
 
 # Test programs
 noinst_PROGRAMS = gis-test tile-test
 
 gis_test_SOURCES = gis-test.c
 gis_test_LDADD   = $(AM_LDADD) libgis.la
+gis_test_LDFLAGS  = $(BINLDFLAGS)
 
 tile_test_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgis.la
+tile_test_LDFLAGS = $(BINLDFLAGS)
 
 
 MAINTAINERCLEANFILES = Makefile.in