Skip to content

Commit

Permalink
fix internal spatialite build with MSVC
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@10536 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 11, 2009
1 parent 788e654 commit e91e4db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/core/spatialite/spatialite.c
Expand Up @@ -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>
Expand Down Expand Up @@ -1480,6 +1482,7 @@ gaiaCleanSqlString (char *value)

/* #include <spatialite/gaiaaux.h> */

#ifndef _MSC_VER
GAIAAUX_DECLARE const char *
gaiaGetLocaleCharset ()
{
Expand All @@ -1494,6 +1497,7 @@ gaiaGetLocaleCharset ()
#endif
#endif
}
#endif

GAIAAUX_DECLARE int
gaiaConvertCharset (char **buf, const char *fromCs, const char *toCs)
Expand Down

0 comments on commit e91e4db

Please sign in to comment.