From d5801f054b1631dd18798ce6b787939c02e1dea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Mon, 4 Apr 2016 07:43:21 +0200 Subject: [PATCH 1/9] Xcode: extract OTHER_CFLAGS into xcconfig file --- sqlcipher.xcconfig | 8 +++++++ sqlcipher.xcodeproj/project.pbxproj | 37 +++++------------------------ 2 files changed, 14 insertions(+), 31 deletions(-) create mode 100644 sqlcipher.xcconfig diff --git a/sqlcipher.xcconfig b/sqlcipher.xcconfig new file mode 100644 index 0000000000..a461c037f4 --- /dev/null +++ b/sqlcipher.xcconfig @@ -0,0 +1,8 @@ +SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE -DSQLCIPHER_CRYPTO_CC +SQLCIPHER_RELEASE_CFLAGS = -DNDEBUG -DSQLITE_OS_UNIX=1 +SQLCIPHER_ARMV6_CFLAGS = -mno-thumb + +OTHER_CFLAGS = $(SQLCIPHER_CFLAGS) +OTHER_CFLAGS[arch=armv6] = $(SQLCIPHER_ARMV6_CFLAGS) $(SQLCIPHER_CFLAGS) +OTHER_CFLAGS[config=Release] = $(SQLCIPHER_CFLAGS) $(SQLCIPHER_RELEASE_CFLAGS) +OTHER_CFLAGS[config=Release][arch=armv6] = $(SQLCIPHER_ARMV6_CFLAGS) $(SQLCIPHER_CFLAGS) $(SQLCIPHER_RELEASE_CFLAGS) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index a3459bce01..bc4681efa4 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -37,6 +37,7 @@ /* Begin PBXFileReference section */ 28B46E6217CD07A600672510 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlcipher.xcconfig; sourceTree = ""; }; 9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -56,6 +57,7 @@ 08FB7794FE84155DC02AAC07 /* sqlcipher */ = { isa = PBXGroup; children = ( + 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */, 28B46E6217CD07A600672510 /* Security.framework */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, @@ -124,7 +126,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0730; }; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */; compatibilityVersion = "Xcode 3.2"; @@ -185,6 +187,7 @@ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; @@ -194,19 +197,6 @@ GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)"; INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = ( - "-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; }; @@ -214,6 +204,7 @@ }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; @@ -221,23 +212,6 @@ GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)"; INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DNDEBUG", - "-DSQLITE_OS_UNIX=1", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); - "OTHER_CFLAGS[arch=armv6]" = ( - "-mno-thumb", - "-DSQLITE_HAS_CODEC", - "-DNDEBUG", - "-DSQLITE_OS_UNIX=1", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; }; @@ -258,6 +232,7 @@ x86_64, i386, ); + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; From 53dae015326c53dff2ba7e5d0065661699f06306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Mon, 4 Apr 2016 08:59:36 +0200 Subject: [PATCH 2/9] Xcode: add the -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT compilation option This is a workaround for https://github.com/sqlcipher/sqlcipher/issues/162 But we need another fix, since SQLITE_ENABLE_UPDATE_DELETE_LIMIT should not be used when building from the amalgation, according to https://www.sqlite.org/compile.html#enable_update_delete_limit --- sqlcipher.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher.xcconfig b/sqlcipher.xcconfig index a461c037f4..4719062c6c 100644 --- a/sqlcipher.xcconfig +++ b/sqlcipher.xcconfig @@ -1,4 +1,4 @@ -SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE -DSQLCIPHER_CRYPTO_CC +SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE -DSQLCIPHER_CRYPTO_CC -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT SQLCIPHER_RELEASE_CFLAGS = -DNDEBUG -DSQLITE_OS_UNIX=1 SQLCIPHER_ARMV6_CFLAGS = -mno-thumb From 0be84c5bb865bc45d99ce6302ec18aa09804811a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Mon, 4 Apr 2016 13:14:58 +0200 Subject: [PATCH 3/9] Use the same compilation options as Apple-provided sqlite3. Ues the same compilation options than the stock sqlite3 shipped with OS X 10.11 and iOS 9.3, as exposed through PRAGMA compile_options. See https://github.com/sqlcipher/sqlcipher/issues/163 --- sqlcipher.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher.xcconfig b/sqlcipher.xcconfig index 4719062c6c..0868b5918c 100644 --- a/sqlcipher.xcconfig +++ b/sqlcipher.xcconfig @@ -1,4 +1,4 @@ -SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE -DSQLCIPHER_CRYPTO_CC -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT +SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_CC -DSQLITE_ENABLE_API_ARMOR -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=1 -DSQLITE_ENABLE_RTREE -DSQLITE_OMIT_AUTORESET -DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_SYSTEM_MALLOC -DSQLITE_THREADSAFE=2 SQLCIPHER_RELEASE_CFLAGS = -DNDEBUG -DSQLITE_OS_UNIX=1 SQLCIPHER_ARMV6_CFLAGS = -mno-thumb From 0b82b2faaa854e51dd2247923803471eb4482b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Tue, 5 Apr 2016 05:45:23 +0200 Subject: [PATCH 4/9] Adapt deployment targets for GRDB --- sqlcipher.xcconfig | 7 +++++++ sqlcipher.xcodeproj/project.pbxproj | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sqlcipher.xcconfig b/sqlcipher.xcconfig index 0868b5918c..8149ec097d 100644 --- a/sqlcipher.xcconfig +++ b/sqlcipher.xcconfig @@ -1,3 +1,10 @@ +// GRDBCipherOSX targets OS X 10.9 +MACOSX_DEPLOYMENT_TARGET = 10.9 + +// GRDBCipheriOS targets iOS 8.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 + +// Compiler flags used by stock sqlite3 shipped with Apple operating systems SQLCIPHER_CFLAGS = -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLCIPHER_CRYPTO_CC -DSQLITE_ENABLE_API_ARMOR -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=1 -DSQLITE_ENABLE_RTREE -DSQLITE_OMIT_AUTORESET -DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_SYSTEM_MALLOC -DSQLITE_THREADSAFE=2 SQLCIPHER_RELEASE_CFLAGS = -DNDEBUG -DSQLITE_OS_UNIX=1 SQLCIPHER_ARMV6_CFLAGS = -mno-thumb diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index bc4681efa4..a2b2ed72a2 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -237,8 +237,6 @@ 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]" = 7.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -265,8 +263,6 @@ 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]" = 7.0; SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; From d1e8afcf0b79d8b48dbb1496cab10ccd0fbbd280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Tue, 5 Apr 2016 05:50:03 +0200 Subject: [PATCH 5/9] README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fc4547f4b0..c5ec544ffe 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +This repository is a fork of https://github.com/sqlcipher/sqlcipher which adapts SQLCipher for https://github.com/groue/GRDB.swift. + +--- + ## SQLCipher SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of From 4f5bec0cf658ee1621e15abe667c129edc92f0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Mon, 25 Apr 2016 20:23:37 +0200 Subject: [PATCH 6/9] https://github.com/groue/GRDB.swift/issues/41 --- sqlcipher.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index a2b2ed72a2..bbda5eae25 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -161,7 +161,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nmake sqlite3.c\nexit 0"; + shellScript = "set -e\n\n# https://github.com/groue/GRDB.swift/issues/41\nif [ \"$PLATFORM_NAME\" -eq \"macosx\" ]\nthen\nSDK_PLATFORM_NAME=\"macosx\"\nelse\nSDK_PLATFORM_NAME=\"iphonesimulator\"\nfi\n\nSDKROOT=\"$(xcrun --sdk $SDK_PLATFORM_NAME --show-sdk-path)\"\nCC=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang)\"\nCXX=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang++)\"\nCFLAGS=\"-isysroot $SDKROOT -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nCXXFLAGS=$CFLAGS\nexport CC CXX CFLAGS CXXFLAGS\n\n[ -e Makefile ] && make distclean\n./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto\nmake sqlite3.c"; }; /* End PBXShellScriptBuildPhase section */ From 01b05172ccfaaee4936801ebf5d42677213c8935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Thu, 4 May 2017 21:15:50 +0200 Subject: [PATCH 7/9] Revert "https://github.com/groue/GRDB.swift/issues/41" This reverts commit 4f5bec0cf658ee1621e15abe667c129edc92f0b8. --- sqlcipher.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 7bc4589ae4..4c38a3fbcd 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -426,7 +426,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -e\n\n# https://github.com/groue/GRDB.swift/issues/41\nif [ \"$PLATFORM_NAME\" -eq \"macosx\" ]\nthen\nSDK_PLATFORM_NAME=\"macosx\"\nelse\nSDK_PLATFORM_NAME=\"iphonesimulator\"\nfi\n\nSDKROOT=\"$(xcrun --sdk $SDK_PLATFORM_NAME --show-sdk-path)\"\nCC=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang)\"\nCXX=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang++)\"\nCFLAGS=\"-isysroot $SDKROOT -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nCXXFLAGS=$CFLAGS\nexport CC CXX CFLAGS CXXFLAGS\n\n[ -e Makefile ] && make distclean\n./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto\nmake sqlite3.c"; + 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 */ From c0f2d70ba5f7152b7eba4f8bc2a8cfbe98a0da9a Mon Sep 17 00:00:00 2001 From: Darren Clark Date: Mon, 9 Oct 2017 17:09:27 -0400 Subject: [PATCH 8/9] Fix iOS builds from command line (xcodebuild) For whatever reason, it seems when building inside Xcode.app, the amalgamation target has environment variables set as if it is being built for macOS (even when building the iOS library), so the configure/make steps work fine. However, when building via the command line (ie: `xcodebuild -scheme sqlcipher -configuration Release -sdk iphoneos`), the amalgamation target was getting environment variables set as if it was building for iOS. This was causing the `configure` step to fail, because it thought the compiler was broken (macOS couldn't run binaries that were being built for iOS). This commit fixes the issue by always running configure as if we were building for macOS. (The sqlcipher target will still build libraries for the correct platform, as it did before) --- sqlcipher.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 4c38a3fbcd..8a82ff0edf 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -79,7 +79,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlcipher.xcconfig; sourceTree = ""; }; 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041A51BFC3A5000ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4C0041A81BFC3A7E00ED2AD5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = macosx/Info.plist; sourceTree = ""; }; @@ -92,7 +91,8 @@ 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041E01BFC3F0800ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; - 9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; + 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlcipher.xcconfig; sourceTree = ""; }; + 9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../sqlite/sqlite3.c; sourceTree = BUILT_PRODUCTS_DIR; }; D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -426,7 +426,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./configure --enable-tempstore=yes --with-crypto-lib=commoncrypto CFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2\"\nmake sqlite3.c\nexit 0"; + shellScript = "set -e\n\necho \"Configure and generate SQLite amalgamation files\"\n\npattern=\" |'\"\nif [[ ${PROJECT_DIR} =~ $pattern ]]\nthen\necho \"Unsafe PROJECT_DIR for make - contains spaces.\"\necho \"PROJECT_DIR=${PROJECT_DIR}\"\nexit 1\nfi\n\n# Ensure we always run configure/make as if we were compiling for macOS (as parts of the\n# configure/make process require building & running an executable)\n#\n# The generated sqlite3.c will be built for the correct platform by Xcode via the\n# 'sqlitecustom' target\nSDK_PLATFORM_NAME=\"macosx\"\nMACOSX_VERSION_MIN=\"$(sw_vers -productVersion | cut -d '.' -f 1,2)\"\n\n\nSDKROOT=\"$(xcrun --sdk $SDK_PLATFORM_NAME --show-sdk-path)\"\nCC=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang)\"\nCXX=\"$(xcrun --sdk $SDK_PLATFORM_NAME -f clang++)\"\nCFLAGS=\"-DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_VERSION_MIN $OTHER_CFLAGS\"\nCXXFLAGS=$CFLAGS\nexport CC CXX CFLAGS CXXFLAGS\n\nmkdir -p \"${DERIVED_SOURCES_DIR}\"\ncd \"${DERIVED_SOURCES_DIR}\"\n\necho \"Clean-up previous files if necessary\"\n[ -e Makefile ] && make distclean\n\necho \"Configure makefile\"\n\"${PROJECT_DIR}/configure\" --srcdir=\"${PROJECT_DIR}/\" --enable-tempstore=yes --with-crypto-lib=commoncrypto\n\necho \"Make SQLite amalgamation\"\nmake sqlite3.c\n\n# copy generated amalgamation files (sqlite3.c and sqlite3.h)\n# to BUILD_DIR/sqlite\nSQLITE_OUTPUT_DIR=\"${BUILD_DIR}/sqlite\"\nmkdir -p \"${SQLITE_OUTPUT_DIR}\"\necho \"Copying sqlite3.c to ${SQLITE_OUTPUT_DIR}/sqlite3.c\"\ncp ./sqlite3.c \"${SQLITE_OUTPUT_DIR}/sqlite3.c\"\necho \"Copying sqlite3.h to ${PROJECT_DIR}/sqlite3.h\"\ncp ./sqlite3.h \"${PROJECT_DIR}/sqlite3.h\"\n\necho \"Finished generating SQLite amalgamation files\"\n"; }; /* End PBXShellScriptBuildPhase section */ From 5276bcd89993ef8028c3ff94f3973484e5ae209a Mon Sep 17 00:00:00 2001 From: Darren Clark Date: Mon, 9 Oct 2017 17:23:31 -0400 Subject: [PATCH 9/9] Project file changes - Remove the SQLCipher OSX/iOS/watchOS/tvOS schemes - Add a 'sqlcipher' scheme that supports all 4 of the plaforms - Update SUPPORTED_PLATFORMS to include all 4 platforms and their simulator counterparts, add armv7k (Watch) to VALID_ARCHS --- sqlcipher.xcodeproj/project.pbxproj | 936 +----------------- .../xcschemes/SQLCipher iOS.xcscheme | 80 -- .../xcschemes/SQLCipher tvOS.xcscheme | 80 -- .../xcschemes/SQLCipher watchOS.xcscheme | 80 -- ...Cipher OSX.xcscheme => sqlcipher.xcscheme} | 22 +- 5 files changed, 16 insertions(+), 1182 deletions(-) delete mode 100644 sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme delete mode 100644 sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme delete mode 100644 sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme rename sqlcipher.xcodeproj/xcshareddata/xcschemes/{SQLCipher OSX.xcscheme => sqlcipher.xcscheme} (82%) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 8a82ff0edf..cba798d642 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -22,21 +22,6 @@ /* Begin PBXBuildFile section */ 4C0041A61BFC3A5000ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041A51BFC3A5000ED2AD5 /* Security.framework */; }; - 4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041BC1BFC3C7500ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041BB1BFC3C7500ED2AD5 /* Security.framework */; }; - 4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041CE1BFC3D3900ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041CD1BFC3D3900ED2AD5 /* Security.framework */; }; - 4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041E01BFC3F0800ED2AD5 /* Security.framework */; }; - 4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; - 4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; 9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; }; /* End PBXBuildFile section */ @@ -48,47 +33,15 @@ remoteGlobalIDString = 9069D08B0FCE185A0042E34C; remoteInfo = amalgamation; }; - 4C0041A11BFC392D00ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041B91BFC3C6E00ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041CB1BFC3D3000ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; - 4C0041DE1BFC3F0100ED2AD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9069D08B0FCE185A0042E34C; - remoteInfo = amalgamation; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041A51BFC3A5000ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4C0041A81BFC3A7E00ED2AD5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = macosx/Info.plist; sourceTree = ""; }; 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLCipher.h; path = macosx/SQLCipher.h; sourceTree = ""; }; - 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041BB1BFC3C7500ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041CD1BFC3D3900ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 4C0041D01BFC3D9A00ED2AD5 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "macosx/Info-tvOS.plist"; sourceTree = ""; }; - 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C0041E01BFC3F0800ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; 5671560F1CB115C8007DC145 /* sqlcipher.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlcipher.xcconfig; sourceTree = ""; }; @@ -97,37 +50,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 4C0041941BFC382400ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AD1BFC3B2200ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041BC1BFC3C7500ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041BF1BFC3CC000ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041CE1BFC3D3900ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D21BFC3E2500ED2AD5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -164,10 +86,6 @@ isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libsqlcipher.a */, - 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */, - 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */, - 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */, - 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */, ); name = Products; sourceTree = ""; @@ -196,42 +114,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 4C0041951BFC382400ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AE1BFC3B2200ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041C01BFC3CC000ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D31BFC3E2500ED2AD5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */, - 4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -242,82 +124,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4C0041971BFC382400ED2AD5 /* SQLCipher iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C00419D1BFC382500ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher iOS" */; - buildPhases = ( - 4C0041931BFC382400ED2AD5 /* Sources */, - 4C0041941BFC382400ED2AD5 /* Frameworks */, - 4C0041951BFC382400ED2AD5 /* Headers */, - 4C0041961BFC382400ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041A21BFC392D00ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher iOS"; - productName = SQLCipher; - productReference = 4C0041981BFC382400ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041B01BFC3B2200ED2AD5 /* SQLCipher OSX */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */; - buildPhases = ( - 4C0041AC1BFC3B2200ED2AD5 /* Sources */, - 4C0041AD1BFC3B2200ED2AD5 /* Frameworks */, - 4C0041AE1BFC3B2200ED2AD5 /* Headers */, - 4C0041AF1BFC3B2200ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041BA1BFC3C6E00ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher OSX"; - productName = "SQLCipher OSX"; - productReference = 4C0041B11BFC3B2200ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041C21BFC3CC000ED2AD5 /* SQLCipher tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */; - buildPhases = ( - 4C0041BE1BFC3CC000ED2AD5 /* Sources */, - 4C0041BF1BFC3CC000ED2AD5 /* Frameworks */, - 4C0041C01BFC3CC000ED2AD5 /* Headers */, - 4C0041C11BFC3CC000ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041CC1BFC3D3000ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher tvOS"; - productName = "SQLCipher tvOS"; - productReference = 4C0041C31BFC3CC000ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; - 4C0041D51BFC3E2500ED2AD5 /* SQLCipher watchOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */; - buildPhases = ( - 4C0041D11BFC3E2500ED2AD5 /* Sources */, - 4C0041D21BFC3E2500ED2AD5 /* Frameworks */, - 4C0041D31BFC3E2500ED2AD5 /* Headers */, - 4C0041D41BFC3E2500ED2AD5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4C0041DF1BFC3F0100ED2AD5 /* PBXTargetDependency */, - ); - name = "SQLCipher watchOS"; - productName = SQLCipher; - productReference = 4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */; - productType = "com.apple.product-type.framework"; - }; D2AAC045055464E500DB518D /* sqlcipher */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "sqlcipher" */; @@ -343,20 +149,6 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0710; - TargetAttributes = { - 4C0041971BFC382400ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041B01BFC3B2200ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041C21BFC3CC000ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - 4C0041D51BFC3E2500ED2AD5 = { - CreatedOnToolsVersion = 7.1; - }; - }; }; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */; compatibilityVersion = "Xcode 3.2"; @@ -372,47 +164,12 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 4C0041971BFC382400ED2AD5 /* SQLCipher iOS */, - 4C0041B01BFC3B2200ED2AD5 /* SQLCipher OSX */, - 4C0041C21BFC3CC000ED2AD5 /* SQLCipher tvOS */, - 4C0041D51BFC3E2500ED2AD5 /* SQLCipher watchOS */, D2AAC045055464E500DB518D /* sqlcipher */, 9069D08B0FCE185A0042E34C /* amalgamation */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 4C0041961BFC382400ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AF1BFC3B2200ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041C11BFC3CC000ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D41BFC3E2500ED2AD5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXShellScriptBuildPhase section */ 9069D08A0FCE185A0042E34C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -431,38 +188,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 4C0041931BFC382400ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041AC1BFC3B2200ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041BE1BFC3CC000ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4C0041D11BFC3E2500ED2AD5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -479,26 +204,6 @@ target = 9069D08B0FCE185A0042E34C /* amalgamation */; targetProxy = 289BE0E7180C4930003E52DA /* PBXContainerItemProxy */; }; - 4C0041A21BFC392D00ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041A11BFC392D00ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041BA1BFC3C6E00ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041B91BFC3C6E00ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041CC1BFC3D3000ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041CB1BFC3D3000ED2AD5 /* PBXContainerItemProxy */; - }; - 4C0041DF1BFC3F0100ED2AD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9069D08B0FCE185A0042E34C /* amalgamation */; - targetProxy = 4C0041DE1BFC3F0100ED2AD5 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -557,8 +262,8 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386"; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos appletvsimulator appletvos watchsimulator watchos"; + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386 armv7k"; }; name = Debug; }; @@ -582,605 +287,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386"; - }; - name = Release; - }; - 4C00419E1BFC382500ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VALUE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "arm64 armv7 armv7s"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C00419F1BFC382500ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VALUE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "arm64 armv7 armv7s"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041B71BFC3B2200ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "i386 x86_64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041B81BFC3B2200ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = macosx; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = "i386 x86_64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041C91BFC3CC000ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "macosx/Info-tvOS.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = arm64; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041CA1BFC3CC000ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "macosx/Info-tvOS.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = arm64; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 4C0041DC1BFC3E2600ED2AD5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = marker; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALID_ARCHS = armv7k; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 4C0041DD1BFC3E2600ED2AD5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)"; - BITCODE_GENERATION_MODE = bitcode; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = macosx/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = ( - "-DSQLITE_HAS_CODEC", - "-DSQLITE_TEMP_STORE=2", - "-DSQLITE_THREADSAFE", - "-DSQLCIPHER_CRYPTO_CC", - "-Wno-ambiguous-macro", - "-Wno-#warnings", - "-Wno-conversion", - "-Wno-unused-const-variable", - "-Wno-unused-function", - "-Wno-unreachable-code", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher; - PRODUCT_NAME = SQLCipher; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "watchsimulator watchos"; - TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = armv7k; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos appletvsimulator appletvos watchsimulator watchos"; + VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386 armv7k"; }; name = Release; }; @@ -1231,42 +339,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4C00419D1BFC382500ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C00419E1BFC382500ED2AD5 /* Debug */, - 4C00419F1BFC382500ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041B71BFC3B2200ED2AD5 /* Debug */, - 4C0041B81BFC3B2200ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041C91BFC3CC000ED2AD5 /* Debug */, - 4C0041CA1BFC3CC000ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4C0041DC1BFC3E2600ED2AD5 /* Debug */, - 4C0041DD1BFC3E2600ED2AD5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9069D0900FCE18970042E34C /* Build configuration list for PBXAggregateTarget "amalgamation" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme deleted file mode 100644 index a988b2bcd4..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher iOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme deleted file mode 100644 index 9104d67653..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher tvOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme deleted file mode 100644 index db6e6d9502..0000000000 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher watchOS.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme b/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme similarity index 82% rename from sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme rename to sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme index a1b6956eb0..cbc2bfc99d 100644 --- a/sqlcipher.xcodeproj/xcshareddata/xcschemes/SQLCipher OSX.xcscheme +++ b/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme @@ -1,6 +1,6 @@ @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -45,9 +47,9 @@ @@ -63,9 +65,9 @@