patches to allow ditto to be compiled statically

This commit is contained in:
Stephen Lombardo 2009-12-05 19:57:48 -05:00
parent 063f9cdd2d
commit b66dd49202
2 changed files with 10 additions and 2 deletions

View File

@ -179,7 +179,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = "$(OPENSSL_SRC)/include"; HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include",
);
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC", "-DSQLITE_HAS_CODEC",
@ -198,7 +201,10 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = "$(OPENSSL_SRC)/include"; HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include",
);
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC", "-DSQLITE_HAS_CODEC",

View File

@ -1315,6 +1315,7 @@ static void groupConcatFinalize(sqlite3_context *context){
** functions. This should be the only routine in this file with ** functions. This should be the only routine in this file with
** external linkage. ** external linkage.
*/ */
#include "ditto_funcs.c"
void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
#ifndef SQLITE_OMIT_ALTERTABLE #ifndef SQLITE_OMIT_ALTERTABLE
sqlite3AlterFunctions(db); sqlite3AlterFunctions(db);
@ -1326,6 +1327,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
db->mallocFailed = 1; db->mallocFailed = 1;
} }
} }
#include "ditto_globals.c"
} }
/* /*