Skip to content
Permalink
Browse files
upgrade internal spatialite from beta to amalgamated 2.3.0 release
git-svn-id: http://svn.osgeo.org/qgis/trunk@10504 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 7, 2009
1 parent 8d6af9e commit cd8ee519b1f0a2b5ac4819af7e68ee1ef7a749e8
Showing with 86,002 additions and 90,386 deletions.
  1. +5 −39 src/core/CMakeLists.txt
  2. +0 −2,663 src/core/spatialite/gaiaexif/gaia_exif.c
  3. +0 −446 src/core/spatialite/gaiageo/gg_advanced.c
  4. +0 −396 src/core/spatialite/gaiageo/gg_endian.c
  5. +0 −1,643 src/core/spatialite/gaiageo/gg_geometries.c
  6. +0 −918 src/core/spatialite/gaiageo/gg_relations.c
  7. +0 −1,823 src/core/spatialite/gaiageo/gg_shape.c
  8. +0 −730 src/core/spatialite/gaiageo/gg_transform.c
  9. +0 −1,613 src/core/spatialite/gaiageo/gg_wkb.c
  10. +0 −2,029 src/core/spatialite/gaiageo/gg_wkt.c
  11. +22 −22 src/core/spatialite/headers/spatialite.h
  12. +23 −23 src/core/spatialite/headers/spatialite/gaiaaux.h
  13. +154 −154 src/core/spatialite/headers/spatialite/gaiaexif.h
  14. +570 −558 src/core/spatialite/headers/spatialite/gaiageo.h
  15. +12 −17 src/core/spatialite/headers/spatialite/spatialite.h
  16. +5,350 −6,599 src/core/spatialite/headers/spatialite/sqlite3.h
  17. +202 −160 src/core/spatialite/headers/spatialite/sqlite3ext.h
  18. +28,633 −0 src/core/spatialite/spatialite.c
  19. +0 −1,440 src/core/spatialite/spatialite/mbrcache.c
  20. +0 −8,012 src/core/spatialite/spatialite/spatialite.c
  21. +0 −1,267 src/core/spatialite/spatialite/virtualfdo.c
  22. +0 −1,666 src/core/spatialite/spatialite/virtualnetwork.c
  23. +0 −521 src/core/spatialite/spatialite/virtualshape.c
  24. +0 −80 src/core/spatialite/spatialite_c99/spatialite_c99.c
  25. +51,031 −55,702 src/core/spatialite/{virtualtext/sqlite3 → }/sqlite3.c
  26. +0 −54 src/core/spatialite/versioninfo/version.c
  27. +0 −557 src/core/spatialite/virtualtext/gaiaaux/gg_sqlaux.c
  28. +0 −176 src/core/spatialite/virtualtext/gaiaaux/gg_utf8.c
  29. +0 −63 src/core/spatialite/virtualtext/versiontext/version.c
  30. +0 −1,015 src/core/spatialite/virtualtext/virtualtext/virtualtext.c
@@ -115,51 +115,14 @@ IF (WITH_INTERNAL_SPATIALITE)
ENDIF (WIN32 OR APPLE)
IF (WIN32)
ADD_DEFINITIONS(-DDLL_EXPORT)
IF (MSVC)
ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DSQLITE_API=__declspec(dllexport)\"")
ENDIF (MSVC)
ENDIF (WIN32)

SET(QGIS_CORE_SRCS
${QGIS_CORE_SRCS}
spatialite/spatialite/mbrcache.c
spatialite/spatialite/spatialite.c
spatialite/spatialite/virtualfdo.c
spatialite/spatialite/virtualnetwork.c
spatialite/spatialite/virtualshape.c

spatialite/spatialite_c99/spatialite_c99.c

spatialite/gaiageo/gg_endian.c
spatialite/gaiageo/gg_geometries.c
spatialite/gaiageo/gg_advanced.c
spatialite/gaiageo/gg_wkb.c
spatialite/gaiageo/gg_wkt.c
spatialite/gaiageo/gg_transform.c
spatialite/gaiageo/gg_shape.c
spatialite/gaiageo/gg_relations.c

spatialite/virtualtext/gaiaaux/gg_sqlaux.c
spatialite/virtualtext/gaiaaux/gg_utf8.c

spatialite/virtualtext/sqlite3/sqlite3.c

spatialite/gaiaexif/gaia_exif.c

spatialite/virtualtext/virtualtext/virtualtext.c

spatialite/versioninfo/version.c

spatialite/sqlite3.c
spatialite/spatialite.c
)

IF (NOT MSVC)
SET_SOURCE_FILES_PROPERTIES(
spatialite/spatialite_c99/spatialite_c99.c
PROPERTIES COMPILE_FLAGS -std=c99)
ENDIF (NOT MSVC)

INCLUDE_DIRECTORIES(spatialite/headers)
ENDIF (WITH_INTERNAL_SPATIALITE)

@@ -299,6 +262,9 @@ IF (WITH_INTERNAL_SPATIALITE)
IF (WIN32 OR APPLE)
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
ENDIF (WIN32 OR APPLE)
IF (UNIX)
TARGET_LINK_LIBRARIES(qgis_core pthread)
ENDIF (UNIX)
ELSE (WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
ENDIF (WITH_INTERNAL_SPATIALITE)

0 comments on commit cd8ee51

Please sign in to comment.