Add:Core:Beginning of adding support for wince and cleanup of win32 support

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1441 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/Makefile.am b/navit/Makefile.am
index ecb918f..0ffe4c5 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -6,7 +6,7 @@ if BUILD_SAMPLEMAP
 endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=navit
-BUILT_SOURCES=osm2navit
+BUILT_SOURCES=osm2navit$(EXEEXT)
 bin_PROGRAMS = navit osm2navit
 
 pkgdata_DATA = navit.xml

diff --git a/navit/osm2navit.c b/navit/osm2navit.c
index cf0bf75..2d5b119 100644 (file)
--- a/navit/osm2navit.c
+++ b/navit/osm2navit.c
@@ -2439,6 +2439,7 @@ write_zipmember(FILE *out, FILE *dir_out, char *name, int filelen, char *data, i
 
        crc=crc32(0, NULL, 0);
        crc=crc32(crc, (unsigned char *)data, data_size);
+#ifdef HAVE_LIBZ
        if (compression_level) {
                error=compress2_int((Byte *)compbuffer, &destlen, (Bytef *)data, data_size, compression_level);
                if (error == Z_OK) {
@@ -2450,6 +2451,7 @@ write_zipmember(FILE *out, FILE *dir_out, char *name, int filelen, char *data, i
                        fprintf(stderr,"compress2 returned %d\n", error);
                }
        }
+#endif
        lfh.zipcrc=crc;
        lfh.zipsize=comp_size;
        lfh.zipuncmp=data_size;
@@ -2640,7 +2642,11 @@ int main(int argc, char **argv)
        int i,c,start=1,end=4,dump_coordinates=0;
        int keep_tmpfiles=0;
        int process_nodes=1, process_ways=1;
+#ifdef HAVE_LIBZ
        int compression_level=9;
+#else
+       int compression_level=0;
+#endif
        int output=0;
        int input=0;
        char *result,*dbstr=NULL;
@@ -2754,9 +2760,11 @@ int main(int argc, char **argv)
                            exit( -1 );
                        }
                        break;
+#ifdef HAVE_LIBZ
                case 'z':
                        compression_level=atoi(optarg);
                        break;
+#endif
                case '?':
                        usage(stderr);
                        break;