Merge branch 'Xcode5' of github.com:sqlcipher/sqlcipher into prerelease
This commit is contained in:
commit
314f5735d9
|
@ -149,7 +149,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=openssl CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_OPENSSL\"\nmake sqlite3.c\nexit 0";
|
||||
shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_CC\"\nmake sqlite3.c\nexit 0";
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
|
@ -228,7 +228,8 @@
|
|||
1DEB91F008733DB70010E9CD /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
|
||||
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||
"ARCHS[sdk=macosx*]" = (
|
||||
x86_64,
|
||||
i386,
|
||||
|
@ -237,28 +238,34 @@
|
|||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
|
||||
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
SKIP_INSTALL = YES;
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
|
||||
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
1DEB91F108733DB70010E9CD /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||
"ARCHS[sdk=iphoneos*]" = (
|
||||
armv7s,
|
||||
armv7,
|
||||
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||
"ARCHS[sdk=macosx*]" = (
|
||||
i386,
|
||||
x86_64,
|
||||
);
|
||||
"ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)";
|
||||
GCC_C_LANGUAGE_STANDARD = c99;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
|
||||
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
|
||||
SDKROOT = iphoneos;
|
||||
SKIP_INSTALL = YES;
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
|
||||
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue