Merge branch 'master' into ditto

sjlombardo · sjlombardo · commit 3bebc079a4b6 · 2011-03-14T12:14:09.000-04:00
diff --git 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]
diff --git 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 = "";
@@ -228,7 +235,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6";
+				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
 			};
 			name = Debug;
 		};
@@ -241,7 +250,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6";
+				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
 			};
 			name = Release;
 		};
