patches to allow ditto to be compiled statically

sjlombardo · sjlombardo · commit b66dd49202c3 · 2009-12-05T19:57:48.000-05:00
diff --git 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
@@ -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"
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1315,6 +1315,7 @@ static void groupConcatFinalize(sqlite3_context *context){`
`1315`	`1315`	`** functions. This should be the only routine in this file with`
`1316`	`1316`	`** external linkage.`
`1317`	`1317`	`*/`
	`1318`	`+#include "ditto_funcs.c"`
`1318`	`1319`	`void sqlite3RegisterBuiltinFunctions(sqlite3 *db){`
`1319`	`1320`	`#ifndef SQLITE_OMIT_ALTERTABLE`
`1320`	`1321`	`sqlite3AlterFunctions(db);`
`@@ -1326,6 +1327,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){`
`1326`	`1327`	`db->mallocFailed = 1;`
`1327`	`1328`	`}`
`1328`	`1329`	`}`
	`1330`	`+#include "ditto_globals.c"`
`1329`	`1331`	`}`
`1330`	`1332`
`1331`	`1333`	`/*`