Fix:Core:More msvc fixes

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

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index c268685..1996ca1 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -92,6 +92,7 @@ CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)
 CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL)
 CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)
+CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
 
 ### Configure build
 #Required libraries, supplied with navit
@@ -349,6 +350,9 @@ if(WIN32 OR WINCE)
 endif()
 if (WIN32)
    set(HAVE_API_WIN32 1)
+   set(HAVE_STDINT_H 1)
+   set(BUILD_MAPTOOL FALSE)
+   set(SAMPLE_MAP FALSE)
    list(APPEND NAVIT_LIBS winmm)
 endif()
 if(WINCE)

diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 6870202..0d2f7fd 100644 (file)
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -62,3 +62,5 @@
 #cmakedefine HAVE_GETOPT_H 1
 
 #cmakedefine HAVE__ATOI64 1
+
+#cmakedefine HAVE_STRING_H 1

diff --git a/navit/navit/support/glib/fake.h b/navit/navit/support/glib/fake.h
index 44e79b9..9ec0b44 100644 (file)
--- a/navit/navit/support/glib/fake.h
+++ b/navit/navit/support/glib/fake.h
@@ -26,7 +26,7 @@
 #  define g_mutex_new g_mutex_new_navit
 #  define g_mutex_lock(lock) (EnterCriticalSection(lock))
 #  define g_mutex_unlock(lock) (LeaveCriticalSection(lock))
-#  define g_mutex_trylock(lock) (TryEnterCriticalSection(lock))
+#  define g_mutex_trylock(lock) 1//(TryEnterCriticalSection(lock))
 #  define GPrivate int
 #  define g_private_new(xd) g_private_new_navit()
 #  define g_private_get(xd) TlsGetValue(xd)

diff --git a/navit/navit/support/win32/stdint.h b/navit/navit/support/win32/stdint.h
index c382cfd..785a639 100644 (file)
--- a/navit/navit/support/win32/stdint.h
+++ b/navit/navit/support/win32/stdint.h
@@ -9,4 +9,5 @@ typedef int  int32_t;
 typedef unsigned   uint32_t;
 typedef long long  int64_t;
 typedef unsigned long long   uint64_t;
+typedef unsigned long long uintmax_t;
 #endif /* _MSC_VER */