diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-09-08 01:42:41 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-09-08 01:42:41 +0300 |
| commit | 6cb05684c5f4bacfb66480b73df45bac030c87c5 (patch) | |
| tree | 5863d73f47327eb768ddd1e08ce87494eaa84129 | |
| parent | 081e9e7151a8ea33cafe4f480dfdd0a1c2eff02a (diff) | |
Add SKIP_INSTALL = YES to our Base.xcconfigs.
This fixes an issue where Mumble cannot be archived
via Xcode because the generated archive contains
both an .app and static library .a files.
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/opensslbuild/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/opusbuild/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/protobufbuild/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/speexbuild/Base.xcconfig | 2 | ||||
| -rw-r--r-- | 3rdparty/speexdspbuild/Base.xcconfig | 2 | ||||
| -rw-r--r-- | cfg/Base.xcconfig | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/3rdparty/celt-0.7.0-build/Base.xcconfig b/3rdparty/celt-0.7.0-build/Base.xcconfig index bc79221..6b12682 100644 --- a/3rdparty/celt-0.7.0-build/Base.xcconfig +++ b/3rdparty/celt-0.7.0-build/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + OTHER_CFLAGS = -x c++ HEADER_SEARCH_PATHS = . diff --git a/3rdparty/opensslbuild/Base.xcconfig b/3rdparty/opensslbuild/Base.xcconfig index 60db44f..cd0d7b8 100644 --- a/3rdparty/opensslbuild/Base.xcconfig +++ b/3rdparty/opensslbuild/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../openssl" "$(PROJECT_DIR)/../openssl/include" "$(PROJECT_DIR)/../openssl/crypto" "$(PROJECT_DIR)/../openssl/crypto/asn1" "$(PROJECT_DIR)/../openssl/crypto/evp" ALWAYS_SEARCH_USER_PATHS = NO diff --git a/3rdparty/opusbuild/Base.xcconfig b/3rdparty/opusbuild/Base.xcconfig index 028df7c..602b66e 100644 --- a/3rdparty/opusbuild/Base.xcconfig +++ b/3rdparty/opusbuild/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../opus/silk/float" "$(PROJECT_DIR)/../opus/silk" "$(PROJECT_DIR)/../opus/include" "$(PROJECT_DIR)/../opus/celt" ALWAYS_SEARCH_USER_PATHS = YES diff --git a/3rdparty/protobufbuild/Base.xcconfig b/3rdparty/protobufbuild/Base.xcconfig index c46f400..4fd2ca3 100644 --- a/3rdparty/protobufbuild/Base.xcconfig +++ b/3rdparty/protobufbuild/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../protobuf/src/runtime/Classes" ALWAYS_SEARCH_USER_PATHS = NO diff --git a/3rdparty/speexbuild/Base.xcconfig b/3rdparty/speexbuild/Base.xcconfig index 2b41d5d..93bea7b 100644 --- a/3rdparty/speexbuild/Base.xcconfig +++ b/3rdparty/speexbuild/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../speex/include" "$(PROJECT_DIR)/../libspeex" ALWAYS_SEARCH_USER_PATHS = NO diff --git a/3rdparty/speexdspbuild/Base.xcconfig b/3rdparty/speexdspbuild/Base.xcconfig index b7762b3..3486a0b 100644 --- a/3rdparty/speexdspbuild/Base.xcconfig +++ b/3rdparty/speexdspbuild/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)" "$(PROJECT_DIR)/../speex/libspeex" "$(PROJECT_DIR)/../speex/include" ALWAYS_SEARCH_USER_PATHS = NO diff --git a/cfg/Base.xcconfig b/cfg/Base.xcconfig index 83c7bfd..538ba87 100644 --- a/cfg/Base.xcconfig +++ b/cfg/Base.xcconfig @@ -8,6 +8,8 @@ SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 IPHONEOS_DEPLOYMENT_TARGET = 8.0 +SKIP_INSTALL = YES + HEADER_SEARCH_PATHS = "$(SRCROOT)/src" "$(SRCROOT)/proto" "$(SRCROOT)/3rdparty/speex/include" "$(SRCROOT)/3rdparty/celt-0.7.0/libcelt" "$(SRCROOT)/3rdparty/opus/include" "$(SRCROOT)/3rdparty/openssl/include" "$(SRCROOT)/3rdparty/protobuf/src/runtime/Classes" LIBRARY_SEARCH_PATHS = "$(inherited)" "$(SRCROOT)" |