|
@@ -64,6 +64,7 @@ function toolchain(_buildDir, _libDir)
|
|
|
{ "ios-arm", "iOS - ARM" },
|
|
{ "ios-arm", "iOS - ARM" },
|
|
|
{ "ios-arm64", "iOS - ARM64" },
|
|
{ "ios-arm64", "iOS - ARM64" },
|
|
|
{ "ios-simulator", "iOS - Simulator" },
|
|
{ "ios-simulator", "iOS - Simulator" },
|
|
|
|
|
+ { "ios-simulator64", "iOS - Simulator 64" },
|
|
|
{ "tvos-arm64", "tvOS - ARM64" },
|
|
{ "tvos-arm64", "tvOS - ARM64" },
|
|
|
{ "tvos-simulator", "tvOS - Simulator" },
|
|
{ "tvos-simulator", "tvOS - Simulator" },
|
|
|
{ "mingw-gcc", "MinGW" },
|
|
{ "mingw-gcc", "MinGW" },
|
|
@@ -272,6 +273,12 @@ function toolchain(_buildDir, _libDir)
|
|
|
premake.gcc.ar = "ar"
|
|
premake.gcc.ar = "ar"
|
|
|
location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator"))
|
|
location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator"))
|
|
|
|
|
|
|
|
|
|
+ elseif "ios-simulator64" == _OPTIONS["gcc"] then
|
|
|
|
|
+ premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
|
|
|
|
+ premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
|
|
|
|
|
+ premake.gcc.ar = "ar"
|
|
|
|
|
+ location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator64"))
|
|
|
|
|
+
|
|
|
elseif "tvos-arm64" == _OPTIONS["gcc"] then
|
|
elseif "tvos-arm64" == _OPTIONS["gcc"] then
|
|
|
premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
|
premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
|
|
premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
|
|
premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
|
|
@@ -1122,6 +1129,24 @@ function toolchain(_buildDir, _libDir)
|
|
|
"--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",
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ configuration { "ios-simulator64" }
|
|
|
|
|
+ targetdir (path.join(_buildDir, "ios-simulator64/bin"))
|
|
|
|
|
+ objdir (path.join(_buildDir, "ios-simulator64/obj"))
|
|
|
|
|
+ libdirs { path.join(_libDir, "lib/ios-simulator64") }
|
|
|
|
|
+ linkoptions {
|
|
|
|
|
+ "-mios-simulator-version-min=7.0",
|
|
|
|
|
+ "-arch x86_64",
|
|
|
|
|
+ "--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",
|
|
|
|
|
+ "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/Frameworks",
|
|
|
|
|
+ "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks",
|
|
|
|
|
+ }
|
|
|
|
|
+ buildoptions {
|
|
|
|
|
+ "-mios-simulator-version-min=7.0",
|
|
|
|
|
+ "-arch x86_64",
|
|
|
|
|
+ "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
configuration { "tvos*" }
|
|
configuration { "tvos*" }
|
|
|
linkoptions {
|
|
linkoptions {
|
|
|
"-lc++",
|
|
"-lc++",
|