From adcd37c89aa3fab709a92671546ec6d5be20ca5e Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Wed, 3 Dec 2014 09:48:33 -0600 Subject: [PATCH 1/2] Adjust amalgamation to target OS X only --- sqlcipher.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index e984986..dcc71d8 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -296,6 +296,8 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = amalgamation; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; }; name = Debug; }; @@ -306,6 +308,8 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; PRODUCT_NAME = amalgamation; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = macosx; ZERO_LINK = NO; }; name = Release; From e1663ef0034b7c8ce1b85c37f0c72cbd89134233 Mon Sep 17 00:00:00 2001 From: Billy Gray Date: Wed, 3 Dec 2014 11:18:10 -0500 Subject: [PATCH 2/2] Updates sqlcipher.xcodeproj ARCH settings for iOS builds to $(ARCHS_STANDARD) + armv7s --- sqlcipher.xcodeproj/project.pbxproj | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index dcc71d8..5c66f77 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -247,8 +247,14 @@ 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + "ARCHS[sdk=iphoneos*]" = ( + "$(ARCHS_STANDARD)", + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = ( + "$(ARCHS_STANDARD)", + armv7s, + ); "ARCHS[sdk=macosx*]" = ( x86_64, i386, @@ -270,8 +276,14 @@ 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + "ARCHS[sdk=iphoneos*]" = ( + "$(ARCHS_STANDARD)", + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = ( + "$(ARCHS_STANDARD)", + armv7s, + ); "ARCHS[sdk=macosx*]" = ( i386, x86_64,