Fix:maptool:Fixed building maptool for android

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

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 2f87c33..32f6065 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -371,8 +371,6 @@ if(ANDROID)
    cfg_feature(SHARED_LIBNAVIT "Android detected" TRUE)
    
    add_feature(XPM2PNG "Android detected" TRUE)
-   # todo: fixe undef. ref to timegm (->timegm64)
-   cfg_feature(BUILD_MAPTOOL "Android detected" FALSE)
    set(NAVIT_COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} -fPIC")
 
 endif(ANDROID)

diff --git a/navit/navit/maptool/CMakeLists.txt b/navit/navit/maptool/CMakeLists.txt
index 1db7187..f9541f1 100644 (file)
--- a/navit/navit/maptool/CMakeLists.txt
+++ b/navit/navit/maptool/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 if(BUILD_MAPTOOL)
-   add_definitions( -DMODULE=maptool )
+   add_definitions( -DMODULE=maptool ${NAVIT_COMPILE_FLAGS})
    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
    SET(MAPTOOL_SOURCE boundaries.c buffer.c ch.c coastline.c geom.c itembin.c itembin_buffer.c misc.c osm.c sourcesink.c tempfile.c tile.c zip.c osm_xml.c)
    if(NOT MSVC)
@@ -11,7 +11,7 @@ if(BUILD_MAPTOOL)
    if(NOT MSVC)
         SET(NAVIT_LIBS ${NAVIT_LIBS} m)
    endif(NOT MSVC)
-   target_link_libraries(maptool maptool_core navit_core ${NAVIT_LIBS})
+   target_link_libraries(maptool maptool_core ${NAVIT_LIBNAME} ${NAVIT_LIBS})
 
    install(TARGETS maptool
            DESTINATION ${BIN_DIR}

diff --git a/navit/navit/maptool/osm_protobufdb.c b/navit/navit/maptool/osm_protobufdb.c
index 8220b34..63d9687 100644 (file)
--- a/navit/navit/maptool/osm_protobufdb.c
+++ b/navit/navit/maptool/osm_protobufdb.c
@@ -543,7 +543,7 @@ osm_protobufdb_timestamp(char *str)
                return 0;
        tm.tm_year-=1900;
        tm.tm_mon-=1;
-#ifdef HAVE_API_WIN32_BASE
+#if defined(HAVE_API_WIN32_BASE) || defined(ANDROID)
        return 0;
 #else
        return timegm(&tm);