Fix:Build:Preparation for modules on wince

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

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 29d6172..b488b1b 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -5,6 +5,12 @@ if ENABLE_NLS
 XCFLAGS=-DINSTALLPREFIX=INSTALLDIR
 if SUPPORT_WIN32
 XCFLAGS+=-DSUBLANG_BENGALI_BANGLADESH=0x03 -DSUBLANG_PUNJABI_PAKISTAN=0x03 -DSUBLANG_ROMANIAN_MOLDOVA=0x03
+if SUPPORT_WIN32CE
+if SHARED_LIBNAVIT
+XCFLAGS+=-L../navit/support/libc -lsupport_libc
+AM_MAKEFLAGS=l=l
+endif
+endif
 endif
 if SUPPORT_ANDROID
 XCFLAGS+=-Xcompiler -nostartfiles

diff --git a/navit/navit/Makefile.am b/navit/navit/Makefile.am
index b2339f9..2a2d8fc 100644 (file)
--- a/navit/navit/Makefile.am
+++ b/navit/navit/Makefile.am
@@ -7,6 +7,8 @@ endif
 DIST_SUBDIRS=binding map maptool fib-1.1 font fonts gui graphics osd plugin speech support vehicle xpm maps
 SUBDIRS+=binding map font gui graphics osd plugin speech vehicle xpm
 
+MODULES = $(wildcard $(top_builddir)/navit/graphics/*/*.la $(top_builddir)/navit/gui/*/*.la $(top_builddir)/navit/map/*/*.la $(top_builddir)/navit/osd/*/*.la $(top_builddir)/navit/speech/*/*.la $(top_builddir)/navit/vehicle/*/*.la)
+
 if FONTS
   SUBDIRS += fonts
 endif
@@ -31,7 +33,7 @@ endif
 if SHARED_LIBNAVIT
   lib_LTLIBRARIES        = lib@LIBNAVIT@.la
   lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ -no-undefined -Wl,--no-undefined
-  lib@LIBNAVIT@_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@
+  lib@LIBNAVIT@_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@ -Lsupport/libc -lsupport_libc
 else
   noinst_LTLIBRARIES        = lib@LIBNAVIT@.la
 endif
@@ -101,8 +103,10 @@ if EVENT_GLIB
 endif
 
 if !PLUGINS
-  navit_SOURCES += builtin.c
-  navit_LDADD += $(wildcard $(top_builddir)/navit/*/*/*.la)
+  lib@LIBNAVIT@_la_SOURCES += builtin.c
+if SHARED_LIBNAVIT
+  lib@LIBNAVIT@_la_LIBADD += $(MODULES)
+endif
 endif
 
 navit_LDADD += @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @CRYPTO_LIBS@ @INTLLIBS@

diff --git a/navit/navit/support/libc/locale.h b/navit/navit/support/libc/locale.h
index fad4f95..51d62f3 100644 (file)
--- a/navit/navit/support/libc/locale.h
+++ b/navit/navit/support/libc/locale.h
@@ -9,4 +9,7 @@ struct lconv {
 
 #define LC_ALL 1
 #define LC_NUMERIC 2
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
 #endif