Browse Source

Update MVK, use gnu11 instead of c99, disable CXX exceptions in production, deploy libc++

Felix Paul Kühne 10 years ago
parent
commit
da3781e40e
2 changed files with 10 additions and 4 deletions
  1. 9 3
      VLC for iOS.xcodeproj/project.pbxproj
  2. 1 1
      compileVLCforiOS.sh

+ 9 - 3
VLC for iOS.xcodeproj/project.pbxproj

@@ -2434,6 +2434,7 @@
 				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = "vlc-ios/VLC for iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2449,7 +2450,8 @@
 					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
 				);
-				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";
@@ -2491,6 +2493,7 @@
 				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = "vlc-ios/VLC for iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2506,7 +2509,8 @@
 					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
 				);
-				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";
@@ -2575,6 +2579,7 @@
 				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = "vlc-ios/VLC for iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2590,7 +2595,8 @@
 					"$(PROJECT_DIR)/External/OneDrive",
 					"$(PROJECT_DIR)",
 				);
-				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/VLC for iOS-Prefix.pch";

+ 1 - 1
compileVLCforiOS.sh

@@ -12,7 +12,7 @@ CONFIGURATION="Release"
 NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 
-TESTEDVLCKITHASH=dd21c7cf
+TESTEDVLCKITHASH=e39453a6
 TESTEDMEDIALIBRARYKITHASH=ee79bd9d
 
 usage()