Win32 build fixes

diff --git a/.gitignore b/.gitignore
index baff3a0a5bbcd9edd3acb2b67d9081482098934b..e3a68c665ee2f6d8d03401382cf5a2b74fc3e9e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *~
 .*.swp
 .swp
 *~
 .*.swp
 .swp

+build/

 Makefile
 Makefile.in
 aclocal.m4
 Makefile
 Makefile.in
 aclocal.m4

diff --git a/configure.ac b/configure.ac
index 6aa57c8e9e1d5e348afd1d8d176d790d1ff8275a..14e135371c2dd00e3255ef34504b9d164b778d0d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,9 @@ case "${host}" in
        *cygwin*)  WIN32="yes" ;;
        *)         WIN32="no"  ;;
 esac
        *cygwin*)  WIN32="yes" ;;
        *)         WIN32="no"  ;;
 esac

+if test "$WIN32" = yes; then
+       ac_default_prefix="/"
+fi

 AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
 AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
 
 AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
 AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
 

diff --git a/gen-win32.sh b/gen-win32.sh
index 7106b06200f7166031a6387a4ba17e76e0ee5dae..ec4c40708101c329d4da1e888b5a07d213986ac4 100755 (executable)
--- a/gen-win32.sh
+++ b/gen-win32.sh
@@ -1,7 +1,3 @@
 #!/bin/bash
 #!/bin/bash

-dir=$(dirname $(readlink -f $0))
-./autogen.sh \
-       "--host=i686-pc-mingw32" \
-       "--libdir=Z:$dir/src/.libs" \
-       "--includedir=Z:$dir/include" \
-       CFLAGS="-g -Werror -Wno-unused $CFLAGS"
+export CFLAGS="-g -Werror -Wno-unused -O3"
+./autogen.sh --host=i686-pc-mingw32

diff --git a/src/Makefile.am b/src/Makefile.am
index 1673dffbef838595d5647a2c6b20f767c26ff918..b41ca0989f8431cc51b4b772ac0970468986c7da 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,15 +37,18 @@ libgis_la_SOURCES = gis.h \
        roam.c        roam.h        \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
        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
 libgis_la_LIBADD  = $(AM_LDADD) \
        objects/libgis-objects.la \
        data/libgis-data.la
 
 # Demo program

-if NOTWIN32
-BINLDFLAGS = -static
+if WIN32
+AM_LDFLAGS += -mwindows
+dots        = ..
+else
+BINLDFLAGS  = -static

 endif
 
 bin_PROGRAMS = gis-demo
 endif
 
 bin_PROGRAMS = gis-demo

diff --git a/src/gis-test.c b/src/gis-test.c
index 6366ade7836541654c55cb9602abd2a5f6a81c68..1146f41215731d985502e1ba411d4871ed60114f 100644 (file)
--- a/src/gis-test.c
+++ b/src/gis-test.c
@@ -88,8 +88,8 @@ int main(int argc, char **argv)
 
        /* Configurable stuff */
        gis_viewer_set_offline(viewer, TRUE);
 
        /* Configurable stuff */
        gis_viewer_set_offline(viewer, TRUE);

-       //load_plugin(plugins, "elev",  viewer, prefs, GTK_NOTEBOOK(config));
-       //load_plugin(plugins, "env",   viewer, prefs, GTK_NOTEBOOK(config));
+       load_plugin(plugins, "elev",  viewer, prefs, GTK_NOTEBOOK(config));
+       load_plugin(plugins, "env",   viewer, prefs, GTK_NOTEBOOK(config));

        //load_plugin(plugins, "map",   viewer, prefs, GTK_NOTEBOOK(config));
        load_plugin(plugins, "sat",   viewer, prefs, GTK_NOTEBOOK(config));
        //load_plugin(plugins, "test",  viewer, prefs, GTK_NOTEBOOK(config));
        //load_plugin(plugins, "map",   viewer, prefs, GTK_NOTEBOOK(config));
        load_plugin(plugins, "sat",   viewer, prefs, GTK_NOTEBOOK(config));
        //load_plugin(plugins, "test",  viewer, prefs, GTK_NOTEBOOK(config));