8000 Merge branch 'Xcode5' of github.com:sqlcipher/sqlcipher into prerelease · githubzhaoliang/sqlcipher@314f573 · GitHub
[go: up one dir, main page]

Skip to content

Commit 314f573

Browse files
committed
Merge branch 'Xcode5' of github.com:sqlcipher/sqlcipher into prerelease
2 parents 0e21396 + cf42f10 commit 314f573

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

sqlcipher.xcodeproj/project.pbxproj

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
);
150150
runOnlyForDeploymentPostprocessing = 0;
151151
shellPath = /bin/sh;
152-
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";
152+
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";
153153
};
154154
/* End PBXShellScriptBuildPhase section */
155155

@@ -228,7 +228,8 @@
228228
1DEB91F008733DB70010E9CD /* Debug */ = {
229229
isa = XCBuildConfiguration;
230230
buildSettings = {
231-
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
231+
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
232+
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
232233
"ARCHS[sdk=macosx*]" = (
233234
x86_64,
234235
i386,
@@ -237,28 +238,34 @@
237238
GCC_OPTIMIZATION_LEVEL = 0;
238239
GCC_WARN_ABOUT_RETURN_TYPE = YES;
239240
GCC_WARN_UNUSED_VARIABLE = YES;
241+
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
242+
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
240243
ONLY_ACTIVE_ARCH = YES;
241244
SDKROOT = iphoneos;
242245
SKIP_INSTALL = YES;
243246
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
247+
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
244248
};
245249
name = Debug;
246250
};
247251
1DEB91F108733DB70010E9CD /* Release */ = {
248252
isa = XCBuildConfiguration;
249253
buildSettings = {
250-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
251-
"ARCHS[sdk=iphoneos*]" = (
252-
armv7s,
253-
armv7,
254+
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
255+
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
256+
"ARCHS[sdk=macosx*]" = (
257+
i386,
258+
x86_64,
254259
);
255-
"ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)";
256260
GCC_C_LANGUAGE_STANDARD = c99;
257261
GCC_WARN_ABOUT_RETURN_TYPE = YES;
258262
GCC_WARN_UNUSED_VARIABLE = YES;
263+
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
264+
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
259265
SDKROOT = iphoneos;
260266
SKIP_INSTALL = YES;
261267
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
268+
VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386";
262269
};
263270
name = Release;
264271
};

0 commit comments

Comments
 (0)
0