aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks
diff options
context:
space:
mode:
Diffstat (limited to 'Frameworks')
-rw-r--r--Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj30
-rw-r--r--Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj30
-rwxr-xr-xFrameworks/SPMySQLFramework/build-mysql-client.sh4
3 files changed, 20 insertions, 44 deletions
diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
index b9f8c87b..2a635675 100644
--- a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
+++ b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
@@ -453,11 +453,7 @@
17E5952D14F302740054EE08 /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -467,8 +463,8 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Resources/Info.plist;
INFOPLIST_PREFIX_HEADER = "";
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Distribution;
};
@@ -681,11 +677,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -697,19 +689,15 @@
INFOPLIST_FILE = Resources/Info.plist;
INFOPLIST_PREFIX_HEADER = "";
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -719,8 +707,8 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Resources/Info.plist;
INFOPLIST_PREFIX_HEADER = "";
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
diff --git a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
index 622e2ffd..c34ab9d2 100644
--- a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
+++ b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
@@ -555,11 +555,7 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -579,19 +575,15 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACH_O_TYPE = mh_dylib;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -609,19 +601,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACH_O_TYPE = mh_dylib;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
586AA55214F5D599007F82BF /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -639,8 +627,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACH_O_TYPE = mh_dylib;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "i386 ppc x86_64";
+ SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
};
name = Distribution;
};
diff --git a/Frameworks/SPMySQLFramework/build-mysql-client.sh b/Frameworks/SPMySQLFramework/build-mysql-client.sh
index 6e7be914..139fcf8b 100755
--- a/Frameworks/SPMySQLFramework/build-mysql-client.sh
+++ b/Frameworks/SPMySQLFramework/build-mysql-client.sh
@@ -44,8 +44,8 @@ DEBUG='NO'
CLEAN='NO'
# Configuration
-MIN_OS_X_VERSION='10.5'
-ARCHITECTURES='-arch ppc -arch i386 -arch x86_64'
+MIN_OS_X_VERSION='10.6'
+ARCHITECTURES='-arch i386 -arch x86_64'
CONFIGURE_OPTIONS='-DBUILD_CONFIG=mysql_release -DENABLED_LOCAL_INFILE=1 -DWITH_SSL=bundled -DWITH_MYSQLD_LDFLAGS="-all-static --disable-shared"'
OUTPUT_DIR='SPMySQLFiles.build'