Bläddra i källkod

Fixed iOS simulator build.

Branimir Karadzic 11 år sedan
förälder
incheckning
125de82b67
1 ändrade filer med 4 tillägg och 1 borttagningar
  1. 4 1
      scripts/toolchain.lua

+ 4 - 1
scripts/toolchain.lua

@@ -742,7 +742,6 @@ function toolchain(_buildDir, _libDir)
 			"-lc++",
 			"-lc++",
 		}
 		}
 		buildoptions {
 		buildoptions {
-			"-miphoneos-version-min=7.0",
 			"-Wfatal-errors",
 			"-Wfatal-errors",
 			"-Wunused-value",
 			"-Wunused-value",
 			"-Wundef",
 			"-Wundef",
@@ -754,6 +753,7 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "ios-arm" .. "/obj")
 		objdir (_buildDir .. "ios-arm" .. "/obj")
 		libdirs { _libDir .. "lib/ios-arm" }
 		libdirs { _libDir .. "lib/ios-arm" }
 		linkoptions {
 		linkoptions {
+			"-miphoneos-version-min=7.0",
 			"-arch armv7",
 			"-arch armv7",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk",
 			"-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/usr/lib/system",
 			"-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/usr/lib/system",
@@ -761,6 +761,7 @@ function toolchain(_buildDir, _libDir)
 			"-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks",
 			"-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks",
 		}
 		}
 		buildoptions {
 		buildoptions {
+			"-miphoneos-version-min=7.0",
 			"-arch armv7",
 			"-arch armv7",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk",
 		}
 		}
@@ -770,6 +771,7 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "ios-simulator" .. "/obj")
 		objdir (_buildDir .. "ios-simulator" .. "/obj")
 		libdirs { _libDir .. "lib/ios-simulator" }
 		libdirs { _libDir .. "lib/ios-simulator" }
 		linkoptions {
 		linkoptions {
+			"-mios-simulator-version-min=7.0",
 			"-arch i386",
 			"-arch i386",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
 			"-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/usr/lib/system",
 			"-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/usr/lib/system",
@@ -777,6 +779,7 @@ function toolchain(_buildDir, _libDir)
 			"-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks",
 			"-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks",
 		}
 		}
 		buildoptions {
 		buildoptions {
+			"-mios-simulator-version-min=7.0",
 			"-arch i386",
 			"-arch i386",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
 			"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
 		}
 		}