diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
| commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
| tree | 6a637dd4dde653f870346a37ec6555eb0574949a /sqlcipher.xcodeproj | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'sqlcipher.xcodeproj')
| -rw-r--r-- | sqlcipher.xcodeproj/project.pbxproj | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj index bb11ac5..a65412d 100644 --- a/sqlcipher.xcodeproj/project.pbxproj +++ b/sqlcipher.xcodeproj/project.pbxproj @@ -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; @@ -215,6 +216,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 = ( @@ -246,7 +248,7 @@ isa = XCBuildConfiguration; buildSettings = { "ARCHS[sdk=iphoneos*]" = ( - armv6, + armv7s, armv7, ); "ARCHS[sdk=macosx*]" = ( @@ -269,7 +271,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "ARCHS[sdk=iphoneos*]" = ( - armv6, + armv7s, armv7, ); "ARCHS[sdk=macosx*]" = ( @@ -288,6 +290,7 @@ 9069D08C0FCE185A0042E34C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -298,6 +301,7 @@ 9069D08D0FCE185A0042E34C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; PRODUCT_NAME = amalgamation; |