fix internal spatialite build with MSVC

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10536 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 11, 2009 · d8ca4a8 · d8ca4a8
1 parent ad1607e
commit d8ca4a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -132,7 +132,7 @@ IF (WITH_INTERNAL_SPATIALITE)
     spatialite/spatialite.c
     )
 
-  INCLUDE_DIRECTORIES(spatialite/headers/spatialite)
+  INCLUDE_DIRECTORIES(BEFORE spatialite/headers/spatialite)
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
 ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)

diff --git a/src/core/spatialite/spatialite.c b/src/core/spatialite/spatialite.c
@@ -66,7 +66,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
 #define LIBICONV_STATIC
 #include <iconv.h>
 #define LIBCHARSET_STATIC
+#ifndef _MSC_VER
 #include <localcharset.h>
+#endif
 #else /* not WINDOWS */
 #ifdef __APPLE__
 #include <iconv.h>
@@ -1480,6 +1482,7 @@ gaiaCleanSqlString (char *value)
 
 /* #include <spatialite/gaiaaux.h> */
 
+#ifndef _MSC_VER
 GAIAAUX_DECLARE const char *
 gaiaGetLocaleCharset ()
 {
@@ -1494,6 +1497,7 @@ gaiaGetLocaleCharset ()
 #endif
 #endif
 }
+#endif
 
 GAIAAUX_DECLARE int
 gaiaConvertCharset (char **buf, const char *fromCs, const char *toCs)