Ver Fonte

Removed OpenGLES. Added Metal framework.

Fixed ios sysroot name.
Added new SDL dependencies.
Raised minimum iOS version to 10.0
Brucey há 3 anos atrás
pai
commit
4fe7a170ec
3 ficheiros alterados com 27 adições e 13 exclusões
  1. 4 4
      bmk_make.bmx
  2. 2 1
      make.bmk
  3. 21 8
      resources/ios/template/project.xcodeproj/project.pbxproj

+ 4 - 4
bmk_make.bmx

@@ -219,12 +219,12 @@ Function ConfigureIOSPaths()
 	Select processor.CPU() 
 		Case "x86", "x64"
 			Local path:String = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
-			globals.SetVar("ios.sysroot", path)
-			globals.SetVar("ios.syslibroot", path)
+			globals.SetVar("ios." + processor.CPU() + ".sysroot", path)
+			globals.SetVar("ios." + processor.CPU() + ".syslibroot", path)
 		Case "armv7", "arm64"
 			Local path:String = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-			globals.SetVar("ios.sysroot", path)
-			globals.SetVar("ios.syslibroot", path)
+			globals.SetVar("ios." + processor.CPU() + ".sysroot", path)
+			globals.SetVar("ios." + processor.CPU() + ".syslibroot", path)
 	End Select
 
 End Function

+ 2 - 1
make.bmk

@@ -472,7 +472,8 @@
 		
 	elseif bmk.Platform() == "ios" then
 	
-		globals.SetOption("cc_opts", "osversion", "-miphoneos-version-min=8.0.0")
+		globals.SetOption("cc_opts", "osversion", "-miphoneos-version-min=10.0.0")
+		globals.SetOption("cc_opts", "ostarget", "-target arm64-apple-ios10.0")
 		
 	elseif bmk.Platform() == "win32" then
 	

+ 21 - 8
resources/ios/template/project.xcodeproj/project.pbxproj

@@ -11,8 +11,10 @@
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
 		7C1E9972134A88FD00674C9B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C1E9971134A88FD00674C9B /* AudioToolbox.framework */; };
-		7C8210651294A217002C4212 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C8210641294A217002C4212 /* OpenGLES.framework */; };
+		7C8210651294A217002C4212 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C8210641294A217002C4212 /* Metal.framework */; };
 		FA8B4B97196703B400F8EB7C /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8B4B96196703B400F8EB7C /* CoreMotion.framework */; };
+		F37DC5F325350EBC0002E6F7 /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F37DC5F225350EBC0002E6F7 /* CoreHaptics.framework */; };
+		A75FDAC423E28BA700529352 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDAC323E28BA700529352 /* CoreBluetooth.framework */; };
 		FAE0E9711BAF96BB0098DFA4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE0E9691BAF96A00098DFA4 /* GameController.framework */; };
 		FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD779EDD0E26BA1200F39101 /* CoreAudio.framework */; };
 		7C8210791294A24C002C4212 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C8210781294A24C002C4212 /* QuartzCore.framework */; };
@@ -29,8 +31,10 @@
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		7C1E9971134A88FD00674C9B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		7C8210641294A217002C4212 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
+		7C8210641294A217002C4212 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
 		FA8B4B96196703B400F8EB7C /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
+		F37DC5F225350EBC0002E6F7 /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = System/Library/Frameworks/CoreHaptics.framework; sourceTree = SDKROOT; };
+		A75FDAC323E28BA700529352 /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
 		FAE0E9691BAF96A00098DFA4 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
 		FD779EDD0E26BA1200F39101 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		7C8210781294A24C002C4212 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -52,13 +56,15 @@
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
 				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
 				288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
-				7C8210651294A217002C4212 /* OpenGLES.framework in Frameworks */,
+				7C8210651294A217002C4212 /* Metal.framework in Frameworks */,
 				7C8210791294A24C002C4212 /* QuartzCore.framework in Frameworks */,
 				FD779EDE0E26BA1200F39101 /* CoreAudio.framework in Frameworks */,
 				7CF9539A1311FB37005295F9 /* OpenAL.framework in Frameworks */,
 				7C1E9972134A88FD00674C9B /* AudioToolbox.framework in Frameworks */,
 				7CFC10BD139C4FF8006BABB6 /* AVFoundation.framework in Frameworks */,
 				FA8B4B97196703B400F8EB7C /* CoreMotion.framework in Frameworks */,
+				F37DC5F325350EBC0002E6F7 /* CoreHaptics.framework in Frameworks */,
+				A75FDAC423E28BA700529352 /* CoreBluetooth.framework in Frameworks */,
 				02BBB1361B7D42DC00BCA3AC /* libstdc++.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -109,8 +115,10 @@
 			children = (
 				FAE0E9691BAF96A00098DFA4 /* GameController.framework */,
 				FA8B4B96196703B400F8EB7C /* CoreMotion.framework */,
+				F37DC5F225350EBC0002E6F7 /* CoreHaptics.framework */,
+				A75FDAC323E28BA700529352 /* CoreBluetooth.framework */,
 				7CFC10BC139C4FF8006BABB6 /* AVFoundation.framework */,
-				7C8210641294A217002C4212 /* OpenGLES.framework */,
+				7C8210641294A217002C4212 /* Metal.framework */,
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
 				1D30AB110D05D00D00671497 /* Foundation.framework */,
 				288765A40DF7441C002DB57D /* CoreGraphics.framework */,
@@ -164,6 +172,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0510;
+				TargetAttributes = {
+					1D6058900D05DD3D006BFB54 = {
+						DevelopmentTeam = ${TEAM_ID};
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "${PROJECT}" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -218,7 +231,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				HEADER_SEARCH_PATHS = libs;
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				ENABLE_BITCODE = NO; /* fixme : to be removed later */
 				LIBRARY_SEARCH_PATHS = (
 				);
@@ -236,7 +249,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				HEADER_SEARCH_PATHS = libs;
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				ENABLE_BITCODE = NO; /* fixme : to be removed later */
 				LIBRARY_SEARCH_PATHS = (
 				);
@@ -255,7 +268,7 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				ENABLE_BITCODE = NO; /* fixme : to be removed later */
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
@@ -273,7 +286,7 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				ENABLE_BITCODE = NO; /* fixme : to be removed later */
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PREBINDING = NO;