signalapp/sqlcipher
signalapp/sqlcipher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into prerelease

Browse Source
This commit is contained in:
Nick Parker 2014-12-03 10:30:07 -06:00
commit 54da745d45
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sqlcipher.xcodeproj/project.pbxproj
View File

@ -247,8 +247,14 @@
1DEB91F008733DB70010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"ARCHS[sdk=iphoneos*]" = (
"$(ARCHS_STANDARD)",
armv7s,
);
"ARCHS[sdk=iphonesimulator*]" = (
"$(ARCHS_STANDARD)",
armv7s,
);
"ARCHS[sdk=macosx*]" = (
x86_64,
i386,
@ -270,8 +276,14 @@
1DEB91F108733DB70010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"ARCHS[sdk=iphoneos*]" = (
"$(ARCHS_STANDARD)",
armv7s,
);
"ARCHS[sdk=iphonesimulator*]" = (
"$(ARCHS_STANDARD)",
armv7s,
);
"ARCHS[sdk=macosx*]" = (
i386,
x86_64,
@ -296,6 +308,8 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = amalgamation;
SDKROOT = macosx;
SUPPORTED_PLATFORMS = macosx;
};
name = Debug;
};
@ -306,6 +320,8 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
PRODUCT_NAME = amalgamation;
SDKROOT = macosx;
SUPPORTED_PLATFORMS = macosx;
ZERO_LINK = NO;
};
name = Release;