From b66dd49202c34576bfacc7afe105ec6b1cd64fb2 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Sat, 5 Dec 2009 19:57:48 -0500 Subject: [PATCH] patches to allow ditto to be compiled statically --- sqlcipher.xcodeproj/project.pbxproj | 10 ++++++++-- src/func.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index cac5792..2525d91 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -179,7 +179,10 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = "$(OPENSSL_SRC)/include"; + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(OPENSSL_SRC)/include", + ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( "-DSQLITE_HAS_CODEC", @@ -198,7 +201,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; - HEADER_SEARCH_PATHS = "$(OPENSSL_SRC)/include"; + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(OPENSSL_SRC)/include", + ); INSTALL_PATH = /usr/local/lib; OTHER_CFLAGS = ( "-DSQLITE_HAS_CODEC", diff --git a/src/func.c b/src/func.c index 2766fa3..a6a8de6 100644 --- a/src/func.c +++ b/src/func.c @@ -1315,6 +1315,7 @@ static void groupConcatFinalize(sqlite3_context *context){ ** functions. This should be the only routine in this file with ** external linkage. */ +#include "ditto_funcs.c" void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ #ifndef SQLITE_OMIT_ALTERTABLE sqlite3AlterFunctions(db); @@ -1326,6 +1327,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ db->mallocFailed = 1; } } +#include "ditto_globals.c" } /*