Merge branch 'prerelease' into ditto

This commit is contained in:
Stephen Lombardo
2013-10-15 14:14:06 -04:00
8 changed files with 50 additions and 25 deletions
+22 -3
View File
@@ -25,6 +25,16 @@
9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
289BE0E7180C4930003E52DA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 9069D08B0FCE185A0042E34C;
remoteInfo = amalgamation;
};
/* End PBXContainerItemProxy 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>"; };
@@ -101,6 +111,7 @@
buildRules = (
);
dependencies = (
289BE0E8180C4930003E52DA /* PBXTargetDependency */,
);
name = sqlcipher;
productName = sqlcipher;
@@ -149,7 +160,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nmake sqlite3.c\nexit 0";
};
/* End PBXShellScriptBuildPhase section */
@@ -164,6 +175,14 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
289BE0E8180C4930003E52DA /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 9069D08B0FCE185A0042E34C /* amalgamation */;
targetProxy = 289BE0E7180C4930003E52DA /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
1DEB91EC08733DB70010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
@@ -247,7 +266,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@@ -269,7 +288,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";