From d6d64068d972efca02a832e4e01ade65ad9b443c Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Tue, 12 Oct 2010 15:31:27 -0700 Subject: [PATCH 1/4] clarify build with temp store options --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 89c8822..d964a72 100644 --- a/README +++ b/README @@ -23,17 +23,17 @@ If you are using SQLCipher in your own software please let us know at support@ze Building SQLite Cipher is almost the same as compiling a regular version of SQLite with three small exceptions: 1. building via 'amalgamation' isn't supported (where all sqlite source is merged into one file) - 2. you must define SQLITE_HAS_CODEC + 2. you must define SQLITE_HAS_CODEC and SQLITE_TEMP_STORE=2 in your application when including SQLCipher 3. You need to link against a OpenSSL's libcrypto with sha256 support compiled in Example Static linking (replace /opt/local/lib with the path to libcrypto.a) - ./configure CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="/opt/local/lib/libcrypto.a" + ./configure --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="/opt/local/lib/libcrypto.a" make Example Dynamic linking - ./configure CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" + ./configure --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" make [Encrypting a database] From 54fb0db816625490af9b4880ba94e83a4cfdd1c2 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Sat, 12 Mar 2011 22:39:18 -0500 Subject: [PATCH 2/4] Add explicit list of supported platforms and architectures to project build settings for compatibility with XCode 4 --- sqlcipher.xcodeproj/project.pbxproj | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index b0645e6..d5d2510 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -121,7 +121,14 @@ isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* sqlcipher */; projectDirPath = ""; projectRoot = ""; @@ -188,6 +195,8 @@ ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; + VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Debug; }; @@ -207,6 +216,8 @@ ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; + VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Release; }; From f13ba3d21e1c16279d35073219f99d3b2c1c0864 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Sat, 12 Mar 2011 23:58:13 -0500 Subject: [PATCH 3/4] set architecture and products at project level, including armv7 --- sqlcipher.xcodeproj/project.pbxproj | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index d5d2510..3a8f547 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -195,8 +195,6 @@ ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Debug; }; @@ -216,8 +214,6 @@ ); OTHER_LDFLAGS = ""; PRODUCT_NAME = sqlcipher; - SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Release; }; @@ -231,7 +227,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6"; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; + VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Debug; }; @@ -244,7 +241,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6"; + SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; + VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; name = Release; }; From df4dc37c34bd8002117649ee5cc47ce8216f31da Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Mon, 14 Mar 2011 12:13:30 -0400 Subject: [PATCH 4/4] set SKIP_INSTALL for XC4 compat --- sqlcipher.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index 3a8f547..0f84cb9 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -227,6 +227,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; + SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; }; @@ -241,6 +242,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; + SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos"; VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7"; };