diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-27 22:01:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-27 22:01:21 +0300 |
commit | 9e9eeab918b07e65671092426b1051bd1bc8736a (patch) | |
tree | 94c2f5ab7a3913369cabb91fee90d0c8f7d33f49 | |
parent | abc36e730251139104889203826a192797230692 (diff) | |
parent | b61fdc40ec74fd6f15b4f4f231bb5d92c5094377 (diff) |
Merge PR #49: Update MumbleKit to Xcode 8.1 defaults.
-rw-r--r-- | 3rdparty/celt-0.7.0-build/Base.xcconfig | 21 | ||||
-rw-r--r-- | 3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | 3rdparty/opensslbuild/Base.xcconfig | 26 | ||||
-rw-r--r-- | 3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | 3rdparty/opusbuild/Base.xcconfig | 22 | ||||
-rw-r--r-- | 3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | 3rdparty/protobufbuild/Base.xcconfig | 25 | ||||
-rw-r--r-- | 3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | 3rdparty/speexbuild/Base.xcconfig | 21 | ||||
-rw-r--r-- | 3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | 3rdparty/speexdspbuild/Base.xcconfig | 23 | ||||
-rw-r--r-- | 3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | MumbleKit.xcodeproj/project.pbxproj | 12 | ||||
-rw-r--r-- | cfg/Base.xcconfig | 21 | ||||
-rw-r--r-- | cfg/Debug.xcconfig | 4 | ||||
-rw-r--r-- | src/MumbleKit-MacOSX.plist | 2 |
16 files changed, 163 insertions, 26 deletions
diff --git a/3rdparty/celt-0.7.0-build/Base.xcconfig b/3rdparty/celt-0.7.0-build/Base.xcconfig index f0f82de..bc79221 100644 --- a/3rdparty/celt-0.7.0-build/Base.xcconfig +++ b/3rdparty/celt-0.7.0-build/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 OTHER_CFLAGS = -x c++ @@ -24,6 +24,25 @@ GCC_FAST_MATH = YES GCC_UNROLL_LOOPS = YES GCC_OPTIMIZATION_LEVEL = 3 +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H PRODUCT_NAME = CELT-0.7.0 diff --git a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj index c9417f1..be64506 100644 --- a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj +++ b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ 280D5F7C132AE73C00540C3D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 280D5F7F132AE73C00540C3D /* Build configuration list for PBXProject "CELT-0.7" */; compatibilityVersion = "Xcode 3.2"; diff --git a/3rdparty/opensslbuild/Base.xcconfig b/3rdparty/opensslbuild/Base.xcconfig index d317687..60db44f 100644 --- a/3rdparty/opensslbuild/Base.xcconfig +++ b/3rdparty/opensslbuild/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 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 @@ -16,7 +16,29 @@ GCC_WARN_INHIBIT_ALL_WARNINGS = YES GCC_PRECOMPILE_PREFIX_HEADER = NO GCC_PREFIX_HEADER = OpenSSL.pch +GCC_FAST_MATH = YES +GCC_UNROLL_LOOPS = YES +GCC_OPTIMIZATION_LEVEL = 3 + +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = NO_WINDOWS_BRAINDEATH=1 OPENSSL_NO_INLINE_ASM=1 OPENSSL_NO_ASM=1 PRODUCT_NAME = OpenSSL - diff --git a/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj b/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj index a8dc5be..45d6f0e 100644 --- a/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj +++ b/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj @@ -3116,7 +3116,7 @@ 28F58C3D132AF1070053C348 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 28F58C40132AF1070053C348 /* Build configuration list for PBXProject "OpenSSL" */; compatibilityVersion = "Xcode 3.2"; diff --git a/3rdparty/opusbuild/Base.xcconfig b/3rdparty/opusbuild/Base.xcconfig index e8bfc75..028df7c 100644 --- a/3rdparty/opusbuild/Base.xcconfig +++ b/3rdparty/opusbuild/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 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 @@ -22,7 +22,25 @@ GCC_FAST_MATH = YES GCC_UNROLL_LOOPS = YES GCC_OPTIMIZATION_LEVEL = 3 +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H FLOAT_APPROX PRODUCT_NAME = Opus - diff --git a/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj b/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj index c39d34c..c837408 100644 --- a/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj +++ b/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj @@ -705,7 +705,7 @@ 287D859D14E6D474002B5D79 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 287D85A014E6D474002B5D79 /* Build configuration list for PBXProject "Opus" */; compatibilityVersion = "Xcode 3.2"; diff --git a/3rdparty/protobufbuild/Base.xcconfig b/3rdparty/protobufbuild/Base.xcconfig index dad1f52..c46f400 100644 --- a/3rdparty/protobufbuild/Base.xcconfig +++ b/3rdparty/protobufbuild/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../protobuf/src/runtime/Classes" ALWAYS_SEARCH_USER_PATHS = NO @@ -21,6 +21,29 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES // them there. So don't. GCC_PREFIX_HEADER = $(PROJECT_DIR)/../protobuf/src/runtime/ProtocolBuffers_Prefix.pch +GCC_FAST_MATH = YES +GCC_UNROLL_LOOPS = YES +GCC_OPTIMIZATION_LEVEL = 3 + +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = PRODUCT_NAME = ProtocolBuffers diff --git a/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj b/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj index c1574e9..91528e6 100644 --- a/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj @@ -250,7 +250,7 @@ 2845A69E132D99550034D631 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 2845A6A1132D99550034D631 /* Build configuration list for PBXProject "ProtocolBuffers" */; compatibilityVersion = "Xcode 3.2"; diff --git a/3rdparty/speexbuild/Base.xcconfig b/3rdparty/speexbuild/Base.xcconfig index 130abce..2b41d5d 100644 --- a/3rdparty/speexbuild/Base.xcconfig +++ b/3rdparty/speexbuild/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 HEADER_SEARCH_PATHS = . "$(PROJECT_DIR)/../speex/include" "$(PROJECT_DIR)/../libspeex" ALWAYS_SEARCH_USER_PATHS = NO @@ -22,6 +22,25 @@ GCC_FAST_MATH = YES GCC_UNROLL_LOOPS = YES GCC_OPTIMIZATION_LEVEL = 3 +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H PRODUCT_NAME = Speex diff --git a/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj b/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj index 761bda2..9196fb4 100644 --- a/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj +++ b/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj @@ -312,7 +312,7 @@ 28D1DADF132AEB1400456ED6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 28D1DAE2132AEB1400456ED6 /* Build configuration list for PBXProject "Speex" */; compatibilityVersion = "Xcode 3.2"; diff --git a/3rdparty/speexdspbuild/Base.xcconfig b/3rdparty/speexdspbuild/Base.xcconfig index 6a96968..b7762b3 100644 --- a/3rdparty/speexdspbuild/Base.xcconfig +++ b/3rdparty/speexdspbuild/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 HEADER_SEARCH_PATHS = "$(PROJECT_DIR)" "$(PROJECT_DIR)/../speex/libspeex" "$(PROJECT_DIR)/../speex/include" ALWAYS_SEARCH_USER_PATHS = NO @@ -22,8 +22,25 @@ GCC_FAST_MATH = YES GCC_UNROLL_LOOPS = YES GCC_OPTIMIZATION_LEVEL = 3 +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H PRODUCT_NAME = SpeexDSP - - diff --git a/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj b/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj index a50a90c..6e00684 100644 --- a/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj +++ b/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj @@ -200,7 +200,7 @@ 28877EB5132D96F300793CC5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0810; }; buildConfigurationList = 28877EB8132D96F300793CC5 /* Build configuration list for PBXProject "SpeexDSP" */; compatibilityVersion = "Xcode 3.2"; diff --git a/MumbleKit.xcodeproj/project.pbxproj b/MumbleKit.xcodeproj/project.pbxproj index 940552b..2ea089e 100644 --- a/MumbleKit.xcodeproj/project.pbxproj +++ b/MumbleKit.xcodeproj/project.pbxproj @@ -121,11 +121,11 @@ 28CC36FB132ED92500241269 /* Mumble.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CC36F8132ED92500241269 /* Mumble.pb.m */; }; 28CC36FC132ED92500241269 /* ObjectivecDescriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CC36F9132ED92500241269 /* ObjectivecDescriptor.pb.m */; }; 28CC36FD132ED92500241269 /* ObjectivecDescriptor.pb.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CC36F9132ED92500241269 /* ObjectivecDescriptor.pb.m */; }; - 28CC3704132EDA5200241269 /* CELT-0.7.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2849235E132ED67E00B4EAAC /* CELT-0.7.0.dylib */; }; - 28CC3705132EDA5200241269 /* OpenSSL.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2849235F132ED67E00B4EAAC /* OpenSSL.dylib */; }; - 28CC3706132EDA5200241269 /* ProtocolBuffers.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492360132ED67E00B4EAAC /* ProtocolBuffers.dylib */; }; - 28CC3707132EDA5200241269 /* Speex.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492361132ED67E00B4EAAC /* Speex.dylib */; }; - 28CC3708132EDA5200241269 /* SpeexDSP.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492362132ED67E00B4EAAC /* SpeexDSP.dylib */; }; + 28CC3704132EDA5200241269 /* CELT-0.7.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2849235E132ED67E00B4EAAC /* CELT-0.7.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 28CC3705132EDA5200241269 /* OpenSSL.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2849235F132ED67E00B4EAAC /* OpenSSL.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 28CC3706132EDA5200241269 /* ProtocolBuffers.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492360132ED67E00B4EAAC /* ProtocolBuffers.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 28CC3707132EDA5200241269 /* Speex.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492361132ED67E00B4EAAC /* Speex.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 28CC3708132EDA5200241269 /* SpeexDSP.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28492362132ED67E00B4EAAC /* SpeexDSP.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 28CC3714132EDC7300241269 /* libOpenSSL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC370F132EDC7300241269 /* libOpenSSL.a */; }; 28CC3715132EDC7300241269 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC3710132EDC7300241269 /* libProtocolBuffers.a */; }; 28CC3716132EDC7300241269 /* libSpeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC3711132EDC7300241269 /* libSpeex.a */; }; @@ -837,7 +837,7 @@ 28BCF2B8132AE3B40003AEC1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0810; }; buildConfigurationList = 28BCF2BB132AE3B40003AEC1 /* Build configuration list for PBXProject "MumbleKit" */; compatibilityVersion = "Xcode 3.2"; diff --git a/cfg/Base.xcconfig b/cfg/Base.xcconfig index 74a98fc..83c7bfd 100644 --- a/cfg/Base.xcconfig +++ b/cfg/Base.xcconfig @@ -6,7 +6,7 @@ ARCHS = armv7 armv7s arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 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)" @@ -22,6 +22,24 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES GCC_SYMBOLS_PRIVATE_EXTERN = NO GCC_UNROLL_LOOPS = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + +PRODUCT_BUNDLE_IDENTIFIER = info.mumble.${PRODUCT_NAME:rfc1034identifier} PRODUCT_NAME = MumbleKit ALWAYS_SEARCH_USER_PATHS = NO @@ -31,4 +49,3 @@ LD_DYLIB_INSTALL_NAME = @loader_path/../Frameworks/$(EXECUTABLE_PATH) FRAMEWORK_VERSION = A INFOPLIST_FILE = src/MumbleKit-MacOSX.plist WRAPPER_EXTENSION = framework - diff --git a/cfg/Debug.xcconfig b/cfg/Debug.xcconfig index 8354a12..0c19e31 100644 --- a/cfg/Debug.xcconfig +++ b/cfg/Debug.xcconfig @@ -5,4 +5,6 @@ #include "Base.xcconfig" GCC_OPTIMIZATION_LEVEL = 0 -GCC_PREPROCESSOR_DEFINITIONS = DEBUG
\ No newline at end of file +GCC_PREPROCESSOR_DEFINITIONS = DEBUG + +ENABLE_TESTABILITY = YES diff --git a/src/MumbleKit-MacOSX.plist b/src/MumbleKit-MacOSX.plist index c153082..c96c193 100644 --- a/src/MumbleKit-MacOSX.plist +++ b/src/MumbleKit-MacOSX.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>info.mumble.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> |