mirror of
https://github.com/etlegacy/etlegacy-libs.git
synced 2025-02-23 20:01:06 +00:00
libs: updated to sqlite-amalgamation-3140100
This commit is contained in:
parent
d75da10905
commit
7d0df9d2bd
6 changed files with 23753 additions and 9550 deletions
|
@ -10,7 +10,8 @@ option(WITH_SQLITE_RTREE "Build R*Tree index extension" OFF)
|
||||||
option(WITH_SQLITE_THREADSAFE "Build SQLite3 threadsafe" OFF)
|
option(WITH_SQLITE_THREADSAFE "Build SQLite3 threadsafe" OFF)
|
||||||
option(SQLITE_OMIT_FLOATING_POINT "Build SQLite3 omit floating-point number support" ON)
|
option(SQLITE_OMIT_FLOATING_POINT "Build SQLite3 omit floating-point number support" ON)
|
||||||
|
|
||||||
#SQLITE_OMIT_LOAD_EXTENSION
|
#SQLITE_OMIT_LOAD_EXTENSION
|
||||||
|
#SQLITE_ENABLE_SESSION
|
||||||
|
|
||||||
#set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
|
#set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
|
||||||
#set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
|
#set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
|
||||||
|
@ -42,7 +43,7 @@ else()
|
||||||
set(SQLITE_WIN_BUILD OFF)
|
set(SQLITE_WIN_BUILD OFF)
|
||||||
|
|
||||||
# FIXME/REWORK: rework this, split into linux/unix/apple, cross-compile
|
# FIXME/REWORK: rework this, split into linux/unix/apple, cross-compile
|
||||||
|
|
||||||
#set(CMAKE_SYSTEM_PROCESSOR i386)
|
#set(CMAKE_SYSTEM_PROCESSOR i386)
|
||||||
#message(STATUS "Forcing ${CMAKE_SYSTEM_PROCESSOR} to cross compile 32bit")
|
#message(STATUS "Forcing ${CMAKE_SYSTEM_PROCESSOR} to cross compile 32bit")
|
||||||
#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
|
#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
|
||||||
|
@ -51,7 +52,7 @@ else()
|
||||||
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
|
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
|
||||||
#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32 -ldl")
|
#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32 -ldl")
|
||||||
#set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32 -ldl")
|
#set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32 -ldl")
|
||||||
|
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ldl")
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ldl")
|
||||||
# probably not needed
|
# probably not needed
|
||||||
#set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ldl")
|
#set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ldl")
|
||||||
|
@ -63,7 +64,7 @@ include_directories(${SQLITE3_SOURCE_DIR}/src)
|
||||||
set(SRC_LIB_FILE ${SQLITE3_SOURCE_DIR}/src/sqlite${SQLITE_VER_MAJOR}.c)
|
set(SRC_LIB_FILE ${SQLITE3_SOURCE_DIR}/src/sqlite${SQLITE_VER_MAJOR}.c)
|
||||||
file(GLOB HDR_FILES ${SQLITE3_SOURCE_DIR}/src/*.h)
|
file(GLOB HDR_FILES ${SQLITE3_SOURCE_DIR}/src/*.h)
|
||||||
|
|
||||||
# exclude flag fast-math for sqlite3 lib!
|
# exclude flag fast-math for sqlite3 lib!
|
||||||
set_source_files_properties(HDR_FILES PROPERTIES COMPILE_FLAGS --fno-fast-math)
|
set_source_files_properties(HDR_FILES PROPERTIES COMPILE_FLAGS --fno-fast-math)
|
||||||
|
|
||||||
# adding compilation flags depending on options
|
# adding compilation flags depending on options
|
||||||
|
|
|
@ -2,4 +2,4 @@ Compile ET: L specific SQLite3 for several plattforms & architectures
|
||||||
|
|
||||||
Download sqlite3 amalgamation sources from https://www.sqlite.org/download.html
|
Download sqlite3 amalgamation sources from https://www.sqlite.org/download.html
|
||||||
|
|
||||||
- tested with sqlite-amalgamation-3100200
|
- tested with sqlite-amalgamation-3140100
|
||||||
|
|
1211
sqlite3/src/shell.c
1211
sqlite3/src/shell.c
File diff suppressed because it is too large
Load diff
30233
sqlite3/src/sqlite3.c
30233
sqlite3/src/sqlite3.c
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -15,12 +15,10 @@
|
||||||
** as extensions by SQLite should #include this file instead of
|
** as extensions by SQLite should #include this file instead of
|
||||||
** sqlite3.h.
|
** sqlite3.h.
|
||||||
*/
|
*/
|
||||||
#ifndef _SQLITE3EXT_H_
|
#ifndef SQLITE3EXT_H
|
||||||
#define _SQLITE3EXT_H_
|
#define SQLITE3EXT_H
|
||||||
#include "sqlite3.h"
|
#include "sqlite3.h"
|
||||||
|
|
||||||
typedef struct sqlite3_api_routines sqlite3_api_routines;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** The following structure holds pointers to all of the SQLite API
|
** The following structure holds pointers to all of the SQLite API
|
||||||
** routines.
|
** routines.
|
||||||
|
@ -279,8 +277,23 @@ struct sqlite3_api_routines {
|
||||||
int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
|
int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
|
||||||
int (*strlike)(const char*,const char*,unsigned int);
|
int (*strlike)(const char*,const char*,unsigned int);
|
||||||
int (*db_cacheflush)(sqlite3*);
|
int (*db_cacheflush)(sqlite3*);
|
||||||
|
/* Version 3.12.0 and later */
|
||||||
|
int (*system_errno)(sqlite3*);
|
||||||
|
/* Version 3.14.0 and later */
|
||||||
|
int (*trace_v2)(sqlite3*,unsigned,int(*)(unsigned,void*,void*,void*),void*);
|
||||||
|
char *(*expanded_sql)(sqlite3_stmt*);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
** This is the function signature used for all extension entry points. It
|
||||||
|
** is also defined in the file "loadext.c".
|
||||||
|
*/
|
||||||
|
typedef int (*sqlite3_loadext_entry)(
|
||||||
|
sqlite3 *db, /* Handle to the database. */
|
||||||
|
char **pzErrMsg, /* Used to set error string on failure. */
|
||||||
|
const sqlite3_api_routines *pThunk /* Extension API function pointers. */
|
||||||
|
);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** The following macros redefine the API routines so that they are
|
** The following macros redefine the API routines so that they are
|
||||||
** redirected through the global sqlite3_api structure.
|
** redirected through the global sqlite3_api structure.
|
||||||
|
@ -522,6 +535,11 @@ struct sqlite3_api_routines {
|
||||||
#define sqlite3_status64 sqlite3_api->status64
|
#define sqlite3_status64 sqlite3_api->status64
|
||||||
#define sqlite3_strlike sqlite3_api->strlike
|
#define sqlite3_strlike sqlite3_api->strlike
|
||||||
#define sqlite3_db_cacheflush sqlite3_api->db_cacheflush
|
#define sqlite3_db_cacheflush sqlite3_api->db_cacheflush
|
||||||
|
/* Version 3.12.0 and later */
|
||||||
|
#define sqlite3_system_errno sqlite3_api->system_errno
|
||||||
|
/* Version 3.14.0 and later */
|
||||||
|
#define sqlite3_trace_v2 sqlite3_api->trace_v2
|
||||||
|
#define sqlite3_expanded_sql sqlite3_api->expanded_sql
|
||||||
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||||
|
|
||||||
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||||
|
@ -539,4 +557,4 @@ struct sqlite3_api_routines {
|
||||||
# define SQLITE_EXTENSION_INIT3 /*no-op*/
|
# define SQLITE_EXTENSION_INIT3 /*no-op*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _SQLITE3EXT_H_ */
|
#endif /* SQLITE3EXT_H */
|
||||||
|
|
Loading…
Reference in a new issue