status-im/sqlcipher
1
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2026-08-30 22:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prerelease' into ditto

Browse Source 
Conflicts:
	sqlcipher.xcodeproj/project.pbxproj
This commit is contained in:
Billy Gray
2013-08-28 18:33:10 -04:00
parent 82344f20d2 3343aaf77e
commit dffb49da90
1 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sqlcipher.xcodeproj/project.pbxproj
+13 -30
View File
@@ -21,20 +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 PBXContainerItemProxy section */
9069D08E0FCE18790042E34C /* 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>"; };
D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -44,6 +36,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
28B46E6317CD07A700672510 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -53,6 +46,7 @@
08FB7794FE84155DC02AAC07 /* sqlcipher */ = {
isa = PBXGroup;
children = (
28B46E6217CD07A600672510 /* Security.framework */,
08FB7795FE84155DC02AAC07 /* Source */,
C6A0FF2B0290797F04C91782 /* Documentation */,
1AB674ADFE9D54B511CA2CBB /* Products */,
@@ -107,7 +101,6 @@
buildRules = (
);
dependencies = (
9069D08F0FCE18790042E34C /* PBXTargetDependency */,
);
name = sqlcipher;
productName = sqlcipher;
@@ -156,7 +149,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "./configure --enable-tempstore=yes CC=/usr/bin/gcc CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nmake sqlite3.c\nexit 0";
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";
};
/* End PBXShellScriptBuildPhase section */
@@ -171,14 +164,6 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
9069D08F0FCE18790042E34C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 9069D08B0FCE185A0042E34C /* amalgamation */;
targetProxy = 9069D08E0FCE18790042E34C /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
1DEB91EC08733DB70010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
@@ -199,12 +184,14 @@
"-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;
@@ -230,6 +217,7 @@
"-DSQLITE_OS_UNIX=1",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
"OTHER_CFLAGS[arch=armv6]" = (
"-mno-thumb",
@@ -238,6 +226,7 @@
"-DSQLITE_OS_UNIX=1",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
);
OTHER_LDFLAGS = "";
PRODUCT_NAME = sqlcipher;
@@ -247,10 +236,7 @@
1DEB91F008733DB70010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = (
armv7s,
armv7,
);
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
"ARCHS[sdk=macosx*]" = (
x86_64,
i386,
@@ -260,7 +246,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";
};
@@ -274,14 +260,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";
};