corrects use of openssl api to commoncrypto, links Security.framework, re-links libsqlcipher.a to fix archive errors, removes use of openssl

This commit is contained in:
Billy Gray 2013-08-27 16:05:48 -04:00
parent f1069eeefe
commit 3343aaf77e
1 changed files with 14 additions and 18 deletions

View File

@ -21,10 +21,12 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
28B46E6317CD07A700672510 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28B46E6217CD07A600672510 /* Security.framework */; };
9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
28B46E6217CD07A600672510 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = "<group>"; };
D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@ -34,6 +36,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
28B46E6317CD07A700672510 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -43,6 +46,7 @@
08FB7794FE84155DC02AAC07 /* sqlcipher */ = {
isa = PBXGroup;
children = (
28B46E6217CD07A600672510 /* Security.framework */,
08FB7795FE84155DC02AAC07 /* Source */,
C6A0FF2B0290797F04C91782 /* Documentation */,
1AB674ADFE9D54B511CA2CBB /* Products */,
@ -170,21 +174,20 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include",
);
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
"OTHER_CFLAGS[arch=armv6]" = (
"-mno-thumb",
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
OTHER_LDFLAGS = "";
PRODUCT_NAME = sqlcipher;
@ -198,10 +201,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)",
"$(OPENSSL_SRC)/include",
);
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
@ -209,6 +209,7 @@
"-DSQLITE_OS_UNIX=1",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
"OTHER_CFLAGS[arch=armv6]" = (
"-mno-thumb",
@ -217,6 +218,7 @@
"-DSQLITE_OS_UNIX=1",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
OTHER_LDFLAGS = "";
PRODUCT_NAME = sqlcipher;
@ -226,10 +228,7 @@
1DEB91F008733DB70010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = (
armv7s,
armv7,
);
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
"ARCHS[sdk=macosx*]" = (
x86_64,
i386,
@ -239,7 +238,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = "$(PLATFORM_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
};
@ -253,14 +252,11 @@
armv7s,
armv7,
);
"ARCHS[sdk=macosx*]" = (
x86_64,
i386,
);
"ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = "$(PLATFORM_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
};