Fix:Core:Build osm2navit for wince

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

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 616d339..d6c14d5 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -44,6 +44,8 @@ endif
 if !PLUGINS
   navit_SOURCES += builtin.c
   navit_LDADD += $(wildcard $(top_builddir)/navit/*/*/*.la)
+  osm2navit_SOURCES += support-builtin.c
+  osm2navit_LDADD += $(wildcard $(top_builddir)/navit/support/*/*.la)
 endif
 
 if SUPPORT_WIN32
@@ -75,3 +77,9 @@ builtin.c: $(top_builddir)/config.h
        echo "void builtin_init(void) {" >>builtin.c
        ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init();/" -e "s/.*\\/lib/    module_/" >>builtin.c
        echo "}" >>builtin.c
+support-builtin.c: $(top_builddir)/config.h
+       ls $(top_builddir)/navit/support/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >support-builtin.c
+       echo "extern void builtin_init(void);" >>support-builtin.c
+       echo "void builtin_init(void) {" >>support-builtin.c
+       ls $(top_builddir)/navit/support/*/*.la | sed -e "s/.la/_init();/" -e "s/.*\\/lib/      module_/" >>support-builtin.c
+       echo "}" >>support-builtin.c

diff --git a/navit/osm2navit.c b/navit/osm2navit.c
index dac81e7..a7f8a69 100644 (file)
--- a/navit/osm2navit.c
+++ b/navit/osm2navit.c
@@ -2829,7 +2829,7 @@ int main(int argc, char **argv)
                        fclose(ways_split);
                        fclose(ways);
                        if(!keep_tmpfiles)
-                               remove("ways.tmp");
+                               unlink("ways.tmp");
                } else
                        fprintf(stderr,"PROGRESS: Skipping Phase 2\n");
        }
@@ -2896,10 +2896,10 @@ int main(int argc, char **argv)
                if (ways_split)
                        fclose(ways_split);
                if(!keep_tmpfiles) {
-                       remove("nodes.tmp");
-                       remove("ways_split.tmp");
-                       remove("tilesdir.tmp");
-                       remove("zipdir.tmp");
+                       unlink("nodes.tmp");
+                       unlink("ways_split.tmp");
+                       unlink("tilesdir.tmp");
+                       unlink("zipdir.tmp");
 #ifdef GENERATE_INDEX
                        remove_countryfiles();
 #endif

diff --git a/navit/support/libc/libc.c b/navit/support/libc/libc.c
index ca75cdc..42d77f6 100644 (file)
--- a/navit/support/libc/libc.c
+++ b/navit/support/libc/libc.c
@@ -80,3 +80,8 @@ localeconv(void)
 {
        return &localedata;
 }
+
+void
+alarm(void)
+{
+}