Merge branch 'master' into ditto

This commit is contained in:
Billy Gray
2012-11-08 11:49:07 -05:00
+7 -3
View File
@@ -120,7 +120,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0450;
};
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sqlcipher" */;
compatibilityVersion = "Xcode 3.2";
@@ -184,6 +184,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
@@ -216,6 +217,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
@@ -248,7 +250,7 @@
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7s,
armv7,
);
"ARCHS[sdk=macosx*]" = (
@@ -271,7 +273,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7s,
armv7,
);
"ARCHS[sdk=macosx*]" = (
@@ -290,6 +292,7 @@
9069D08C0FCE185A0042E34C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -300,6 +303,7 @@
9069D08D0FCE185A0042E34C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
PRODUCT_NAME = amalgamation;