[QGIS Commit] r10536 - in trunk/qgis/src/core: . spatialite

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-11 16:16:57 -0400 (Sat, 11 Apr 2009)
New Revision: 10536

Modified:
   trunk/qgis/src/core/CMakeLists.txt
   trunk/qgis/src/core/spatialite/spatialite.c
Log:
fix internal spatialite build with MSVC

Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt	2009-04-11 19:52:01 UTC (rev 10535)
+++ trunk/qgis/src/core/CMakeLists.txt	2009-04-11 20:16:57 UTC (rev 10536)
@@ -132,7 +132,7 @@
     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)

Modified: trunk/qgis/src/core/spatialite/spatialite.c
===================================================================
--- trunk/qgis/src/core/spatialite/spatialite.c	2009-04-11 19:52:01 UTC (rev 10535)
+++ trunk/qgis/src/core/spatialite/spatialite.c	2009-04-11 20:16:57 UTC (rev 10536)
@@ -66,7 +66,9 @@
 #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 @@
 
 /* #include <spatialite/gaiaaux.h> */
 
+#ifndef _MSC_VER
 GAIAAUX_DECLARE const char *
 gaiaGetLocaleCharset ()
 {
@@ -1494,6 +1497,7 @@
 #endif
 #endif
 }
+#endif
 
 GAIAAUX_DECLARE int
 gaiaConvertCharset (char **buf, const char *fromCs, const char *toCs)