mirror of
https://github.com/bkaradzic/bx.git
synced 2026-02-17 20:52:37 +01:00
Removed support for ios-simulator.
This commit is contained in:
@@ -81,10 +81,7 @@ function toolchain(_buildDir, _libDir)
|
||||
{ "linux-riscv64-gcc", "Linux (RISC-V 64, GCC compiler)" },
|
||||
{ "ios-arm", "iOS - ARM" },
|
||||
{ "ios-arm64", "iOS - ARM64" },
|
||||
{ "ios-simulator", "iOS - Simulator" },
|
||||
{ "ios-simulator64", "iOS - Simulator 64" },
|
||||
{ "tvos-arm64", "tvOS - ARM64" },
|
||||
{ "tvos-simulator", "tvOS - Simulator" },
|
||||
{ "mingw-gcc", "MinGW" },
|
||||
{ "mingw-clang", "MinGW (clang compiler)" },
|
||||
{ "netbsd", "NetBSD" },
|
||||
@@ -256,30 +253,12 @@ function toolchain(_buildDir, _libDir)
|
||||
premake.gcc.ar = "ar"
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-" .. _OPTIONS["gcc"]))
|
||||
|
||||
elseif "ios-simulator" == _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-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
|
||||
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 .. "-tvos-arm64"))
|
||||
|
||||
elseif "tvos-simulator" == _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 .. "-tvos-simulator"))
|
||||
|
||||
elseif "linux-gcc" == _OPTIONS["gcc"] then
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
|
||||
|
||||
@@ -1018,42 +997,6 @@ function toolchain(_buildDir, _libDir)
|
||||
"-fembed-bitcode",
|
||||
}
|
||||
|
||||
configuration { "ios-simulator" }
|
||||
targetdir (path.join(_buildDir, "ios-simulator/bin"))
|
||||
objdir (path.join(_buildDir, "ios-simulator/obj"))
|
||||
libdirs { path.join(_libDir, "lib/ios-simulator") }
|
||||
linkoptions {
|
||||
"-mios-simulator-version-min=9.0",
|
||||
"-arch i386",
|
||||
"--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=9.0",
|
||||
"-arch i386",
|
||||
"--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=9.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=9.0",
|
||||
"-arch x86_64",
|
||||
"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk",
|
||||
}
|
||||
|
||||
configuration { "tvos*" }
|
||||
linkoptions {
|
||||
"-lc++",
|
||||
@@ -1087,24 +1030,6 @@ function toolchain(_buildDir, _libDir)
|
||||
"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS" ..tvosPlatform .. ".sdk",
|
||||
}
|
||||
|
||||
configuration { "tvos-simulator" }
|
||||
targetdir (path.join(_buildDir, "tvos-simulator/bin"))
|
||||
objdir (path.join(_buildDir, "tvos-simulator/obj"))
|
||||
libdirs { path.join(_libDir, "lib/tvos-simulator") }
|
||||
linkoptions {
|
||||
"-mtvos-simulator-version-min=9.0",
|
||||
"-arch i386",
|
||||
"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk",
|
||||
"-L/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/usr/lib/system",
|
||||
"-F/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/System/Library/Frameworks",
|
||||
"-F/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk/System/Library/PrivateFrameworks",
|
||||
}
|
||||
buildoptions {
|
||||
"-mtvos-simulator-version-min=9.0",
|
||||
"-arch i386",
|
||||
"--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk",
|
||||
}
|
||||
|
||||
configuration { "orbis" }
|
||||
targetdir (path.join(_buildDir, "orbis/bin"))
|
||||
objdir (path.join(_buildDir, "orbis/obj"))
|
||||
|
||||
Reference in New Issue
Block a user