diff options
Diffstat (limited to '3rdparty/bx/scripts/toolchain.lua')
-rw-r--r-- | 3rdparty/bx/scripts/toolchain.lua | 84 |
1 files changed, 59 insertions, 25 deletions
diff --git a/3rdparty/bx/scripts/toolchain.lua b/3rdparty/bx/scripts/toolchain.lua index 59795b2be9d..fced6542b9a 100644 --- a/3rdparty/bx/scripts/toolchain.lua +++ b/3rdparty/bx/scripts/toolchain.lua @@ -20,12 +20,13 @@ function toolchain(_buildDir, _libDir) { "freebsd", "FreeBSD" }, { "linux-gcc", "Linux (GCC compiler)" }, { "linux-gcc-afl", "Linux (GCC + AFL fuzzer)" }, - { "linux-gcc-5", "Linux (GCC-5 compiler)" }, + { "linux-gcc-6", "Linux (GCC-6 compiler)" }, { "linux-clang", "Linux (Clang compiler)" }, { "linux-clang-afl", "Linux (Clang + AFL fuzzer)" }, { "linux-mips-gcc", "Linux (MIPS, GCC compiler)" }, { "linux-arm-gcc", "Linux (ARM, GCC compiler)" }, { "ios-arm", "iOS - ARM" }, + { "ios-arm64", "iOS - ARM64" }, { "ios-simulator", "iOS - Simulator" }, { "tvos-arm64", "tvOS - ARM64" }, { "tvos-simulator", "tvOS - Simulator" }, @@ -36,7 +37,7 @@ function toolchain(_buildDir, _libDir) { "netbsd", "NetBSD" }, { "osx", "OSX" }, { "pnacl", "Native Client - PNaCl" }, - { "ps4", "PS4" }, + { "orbis", "Orbis" }, { "qnx-arm", "QNX/Blackberry - ARM" }, { "rpi", "RaspberryPi" }, }, @@ -58,6 +59,7 @@ function toolchain(_buildDir, _libDir) { "winstore81", "Windows Store 8.1" }, { "winstore82", "Universal Windows App" }, { "durango", "Durango" }, + { "orbis", "Orbis" }, }, } @@ -195,11 +197,12 @@ function toolchain(_buildDir, _libDir) elseif "freebsd" == _OPTIONS["gcc"] then location (path.join(_buildDir, "projects", _ACTION .. "-freebsd")) - elseif "ios-arm" == _OPTIONS["gcc"] then + elseif "ios-arm" == _OPTIONS["gcc"] + or "ios-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 .. "-ios-arm")) + 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" @@ -228,9 +231,9 @@ function toolchain(_buildDir, _libDir) premake.gcc.ar = "ar" location (path.join(_buildDir, "projects", _ACTION .. "-linux")) - elseif "linux-gcc-5" == _OPTIONS["gcc"] then - premake.gcc.cc = "gcc-5" - premake.gcc.cxx = "g++-5" + elseif "linux-gcc-6" == _OPTIONS["gcc"] then + premake.gcc.cc = "gcc-6" + premake.gcc.cxx = "g++-6" premake.gcc.ar = "ar" location (path.join(_buildDir, "projects", _ACTION .. "-linux")) @@ -356,18 +359,18 @@ function toolchain(_buildDir, _libDir) premake.gcc.ar = naclToolchain .. "ar" location (path.join(_buildDir, "projects", _ACTION .. "-pnacl")) - elseif "ps4" == _OPTIONS["gcc"] then + elseif "orbis" == _OPTIONS["gcc"] then - if not os.getenv("PS4_SDK_ROOT") then - print("Set PS4_SDK_ROOT enviroment variable.") + if not os.getenv("SCE_ORBIS_SDK_DIR") then + print("Set SCE_ORBIS_SDK_DIR enviroment variable.") end - ps4Toolchain = "$(PS4_SDK_ROOT)/host_tools/bin/orbis-" + orbisToolchain = "$(SCE_ORBIS_SDK_DIR)/host_tools/bin/orbis-" - premake.gcc.cc = ps4Toolchain .. "clang" - premake.gcc.cxx = ps4Toolchain .. "clang++" - premake.gcc.ar = ps4Toolchain .. "ar" - location (path.join(_buildDir, "projects", _ACTION .. "-ps4")) + premake.gcc.cc = orbisToolchain .. "clang" + premake.gcc.cxx = orbisToolchain .. "clang++" + premake.gcc.ar = orbisToolchain .. "ar" + location (path.join(_buildDir, "projects", _ACTION .. "-orbis")) elseif "qnx-arm" == _OPTIONS["gcc"] then @@ -431,6 +434,15 @@ function toolchain(_buildDir, _libDir) premake.vstudio.storeapp = "durango" platforms { "Durango" } location (path.join(_buildDir, "projects", _ACTION .. "-durango")) + elseif "orbis" == _OPTIONS["vs"] then + + if not os.getenv("SCE_ORBIS_SDK_DIR") then + print("Set SCE_ORBIS_SDK_DIR enviroment variable.") + end + + platforms { "Orbis" } + location (path.join(_buildDir, "projects", _ACTION .. "-orbis")) + end elseif ("vs2012-xp") == _OPTIONS["vs"] then @@ -485,6 +497,11 @@ function toolchain(_buildDir, _libDir) "__STDC_CONSTANT_MACROS", } + configuration { "qbs" } + flags { + "ExtraWarnings", + } + configuration { "Debug" } targetsuffix "Debug" @@ -500,7 +517,7 @@ function toolchain(_buildDir, _libDir) "EnableSSE2", } - configuration { "vs*" } + configuration { "vs*", "not orbis" } includedirs { path.join(bxDir, "include/compat/msvc") } defines { "WIN32", @@ -637,7 +654,7 @@ function toolchain(_buildDir, _libDir) configuration { "linux-clang" } - configuration { "linux-gcc-5" } + configuration { "linux-gcc-6" } buildoptions { -- "-fno-omit-frame-pointer", -- "-fsanitize=address", @@ -1056,8 +1073,26 @@ function toolchain(_buildDir, _libDir) objdir (path.join(_buildDir, "ios-arm/obj")) libdirs { path.join(_libDir, "lib/ios-arm") } linkoptions { - "-miphoneos-version-min=7.0", "-arch armv7", + } + buildoptions { + "-arch armv7", + } + + configuration { "ios-arm64" } + targetdir (path.join(_buildDir, "ios-arm64/bin")) + objdir (path.join(_buildDir, "ios-arm64/obj")) + libdirs { path.join(_libDir, "lib/ios-arm64") } + linkoptions { + "-arch arm64", + } + buildoptions { + "-arch arm64", + } + + configuration { "ios-arm*" } + linkoptions { + "-miphoneos-version-min=7.0", "--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", "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/System/Library/Frameworks", @@ -1065,7 +1100,6 @@ function toolchain(_buildDir, _libDir) } buildoptions { "-miphoneos-version-min=7.0", - "-arch armv7", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk", } @@ -1138,14 +1172,14 @@ function toolchain(_buildDir, _libDir) "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator" ..tvosPlatform .. ".sdk", } - configuration { "ps4" } - targetdir (path.join(_buildDir, "ps4/bin")) - objdir (path.join(_buildDir, "ps4/obj")) - libdirs { path.join(_libDir, "lib/ps4") } + configuration { "orbis" } + targetdir (path.join(_buildDir, "orbis/bin")) + objdir (path.join(_buildDir, "orbis/obj")) + libdirs { path.join(_libDir, "lib/orbis") } includedirs { path.join(bxDir, "include/compat/freebsd"), - "$(PS4_SDK_ROOT)/target/include", - "$(PS4_SDK_ROOT)/target/include_common", + "$(SCE_ORBIS_SDK_DIR)/target/include", + "$(SCE_ORBIS_SDK_DIR)/target/include_common", } buildoptions { } |