From 1043ee14352b6d1f398eb4d494109778fb1babe4 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 30 Sep 2015 10:19:35 +0200 Subject: [PATCH] xcode: fix tutorial and liblinphone projects and add them to CI to avoid this in the future --- TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj | 7 +------ submodules/liblinphone.xcodeproj/project.pbxproj | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj index a1a9abe7f..d5953a5a3 100755 --- a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj +++ b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj @@ -101,7 +101,6 @@ 63D5C1661BA6E765002D1ABF /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1171BA6E4F0002D1ABF /* libopus.a */; }; 63D5C1671BA6E765002D1ABF /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1181BA6E4F0002D1ABF /* libortp.a */; }; 63D5C1681BA6E765002D1ABF /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1191BA6E4F0002D1ABF /* libpolarssl.a */; }; - 63D5C1691BA6E765002D1ABF /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11A1BA6E4F0002D1ABF /* libSKP_SILK_SDK.a */; }; 63D5C16A1BA6E765002D1ABF /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11B1BA6E4F0002D1ABF /* libspeex.a */; }; 63D5C16B1BA6E765002D1ABF /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11C1BA6E4F0002D1ABF /* libspeexdsp.a */; }; 63D5C16C1BA6E765002D1ABF /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11D1BA6E4F0002D1ABF /* libsrtp.a */; }; @@ -151,7 +150,6 @@ 63D5C1991BA6E92A002D1ABF /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1171BA6E4F0002D1ABF /* libopus.a */; }; 63D5C19A1BA6E92A002D1ABF /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1181BA6E4F0002D1ABF /* libortp.a */; }; 63D5C19B1BA6E92A002D1ABF /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1191BA6E4F0002D1ABF /* libpolarssl.a */; }; - 63D5C19C1BA6E92A002D1ABF /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11A1BA6E4F0002D1ABF /* libSKP_SILK_SDK.a */; }; 63D5C19D1BA6E92A002D1ABF /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11B1BA6E4F0002D1ABF /* libspeex.a */; }; 63D5C19E1BA6E92A002D1ABF /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11C1BA6E4F0002D1ABF /* libspeexdsp.a */; }; 63D5C19F1BA6E92A002D1ABF /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11D1BA6E4F0002D1ABF /* libsrtp.a */; }; @@ -181,7 +179,6 @@ 63D5C1B71BA6E95C002D1ABF /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1171BA6E4F0002D1ABF /* libopus.a */; }; 63D5C1B81BA6E95C002D1ABF /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1181BA6E4F0002D1ABF /* libortp.a */; }; 63D5C1B91BA6E95C002D1ABF /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1191BA6E4F0002D1ABF /* libpolarssl.a */; }; - 63D5C1BA1BA6E95C002D1ABF /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11A1BA6E4F0002D1ABF /* libSKP_SILK_SDK.a */; }; 63D5C1BB1BA6E95C002D1ABF /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11B1BA6E4F0002D1ABF /* libspeex.a */; }; 63D5C1BC1BA6E95C002D1ABF /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11C1BA6E4F0002D1ABF /* libspeexdsp.a */; }; 63D5C1BD1BA6E95C002D1ABF /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11D1BA6E4F0002D1ABF /* libsrtp.a */; }; @@ -365,7 +362,6 @@ 63D5C1661BA6E765002D1ABF /* libopus.a in Frameworks */, 63D5C1671BA6E765002D1ABF /* libortp.a in Frameworks */, 63D5C1681BA6E765002D1ABF /* libpolarssl.a in Frameworks */, - 63D5C1691BA6E765002D1ABF /* libSKP_SILK_SDK.a in Frameworks */, 63D5C16A1BA6E765002D1ABF /* libspeex.a in Frameworks */, 63D5C16B1BA6E765002D1ABF /* libspeexdsp.a in Frameworks */, 63D5C16C1BA6E765002D1ABF /* libsrtp.a in Frameworks */, @@ -402,7 +398,6 @@ 63D5C1991BA6E92A002D1ABF /* libopus.a in Frameworks */, 63D5C19A1BA6E92A002D1ABF /* libortp.a in Frameworks */, 63D5C19B1BA6E92A002D1ABF /* libpolarssl.a in Frameworks */, - 63D5C19C1BA6E92A002D1ABF /* libSKP_SILK_SDK.a in Frameworks */, 63D5C19D1BA6E92A002D1ABF /* libspeex.a in Frameworks */, 63D5C19E1BA6E92A002D1ABF /* libspeexdsp.a in Frameworks */, 63D5C19F1BA6E92A002D1ABF /* libsrtp.a in Frameworks */, @@ -452,7 +447,6 @@ 63D5C1B71BA6E95C002D1ABF /* libopus.a in Frameworks */, 63D5C1B81BA6E95C002D1ABF /* libortp.a in Frameworks */, 63D5C1B91BA6E95C002D1ABF /* libpolarssl.a in Frameworks */, - 63D5C1BA1BA6E95C002D1ABF /* libSKP_SILK_SDK.a in Frameworks */, 63D5C1BB1BA6E95C002D1ABF /* libspeex.a in Frameworks */, 63D5C1BC1BA6E95C002D1ABF /* libspeexdsp.a in Frameworks */, 63D5C1BD1BA6E95C002D1ABF /* libsrtp.a in Frameworks */, @@ -955,6 +949,7 @@ HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include"; IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib"; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = iphoneos; }; diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index b19266259..21ed8f629 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -2139,6 +2139,7 @@ externals/speex/include, ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; VALID_ARCHS = "arm64 armv7"; @@ -2625,7 +2626,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -2852,7 +2852,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; WRAPPER_EXTENSION = app; @@ -2899,7 +2898,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -2956,7 +2954,6 @@ INFOPLIST_FILE = "mediastream-tester Tests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/mediastream-tester.app/mediastream-tester"; }; @@ -3110,7 +3107,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "mediastream-tester"; PROVISIONING_PROFILE = ""; SKIP_INSTALL = YES; @@ -3171,7 +3167,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "mediastream-tester"; PROVISIONING_PROFILE = ""; @@ -3234,7 +3229,6 @@ "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib", "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); - ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "mediastream-tester"; PROVISIONING_PROFILE = "";