From 540f418ad92ac0637567e37fa8e84f5e03148857 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 25 Nov 2014 14:11:12 +0100 Subject: [PATCH] Disable x86_64 for subprojects: we don't compile the SDK for this arch. --- .../NinePatch.xcodeproj/project.pbxproj | 29 ++++++++++++++++--- .../XMLRPC/XMLRPC.xcodeproj/project.pbxproj | 29 ++++++++++++++++--- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj index fe409cc31..64cad459f 100755 --- a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj +++ b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj @@ -269,7 +269,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -279,9 +283,11 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = NinePatch; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 i386 armv7"; }; name = Debug; }; @@ -289,7 +295,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = s; @@ -301,6 +311,7 @@ PRODUCT_NAME = NinePatch; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 i386 armv7"; }; name = Release; }; @@ -354,7 +365,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = s; @@ -366,6 +381,7 @@ PRODUCT_NAME = NinePatch; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 i386 armv7"; }; name = Distribution; }; @@ -388,7 +404,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = s; @@ -400,6 +420,7 @@ PRODUCT_NAME = NinePatch; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 i386 armv7"; }; name = DistributionAdhoc; }; diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj index 977e77a1c..7f88ddaeb 100755 --- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj +++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj @@ -386,7 +386,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_THUMB_SUPPORT = NO; @@ -396,6 +400,7 @@ PUBLIC_HEADERS_FOLDER_PATH = /headers/; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 armv7 i386"; ZERO_LINK = NO; }; name = Release; @@ -416,7 +421,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_DYNAMIC_NO_PIC = NO; @@ -424,10 +433,12 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = XMLRPC; PUBLIC_HEADERS_FOLDER_PATH = /headers/; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 armv7 i386"; }; name = Debug; }; @@ -447,7 +458,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_THUMB_SUPPORT = NO; @@ -457,6 +472,7 @@ PUBLIC_HEADERS_FOLDER_PATH = /headers/; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 armv7 i386"; ZERO_LINK = NO; }; name = Distribution; @@ -477,7 +493,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + i386, + arm64, + armv7, + ); COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_THUMB_SUPPORT = NO; @@ -487,6 +507,7 @@ PUBLIC_HEADERS_FOLDER_PATH = /headers/; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 armv7 i386"; ZERO_LINK = NO; }; name = DistributionAdhoc;