|
|
@@ -71,7 +71,6 @@ function toolchain(_buildDir, _libDir)
|
|
|
{ "netbsd", "NetBSD" },
|
|
|
{ "osx", "OSX" },
|
|
|
{ "orbis", "Orbis" },
|
|
|
- { "qnx-arm", "QNX/Blackberry - ARM" },
|
|
|
{ "riscv", "RISC-V" },
|
|
|
{ "rpi", "RaspberryPi" },
|
|
|
},
|
|
|
@@ -90,10 +89,6 @@ function toolchain(_buildDir, _libDir)
|
|
|
{ "vs2013-xp", "Visual Studio 2013 targeting XP" },
|
|
|
{ "vs2015-xp", "Visual Studio 2015 targeting XP" },
|
|
|
{ "vs2017-xp", "Visual Studio 2017 targeting XP" },
|
|
|
- { "winphone8", "Windows Phone 8.0" },
|
|
|
- { "winphone81", "Windows Phone 8.1" },
|
|
|
- { "winstore81", "Windows Store 8.1" },
|
|
|
- { "winstore82", "Universal Windows App 8.2" },
|
|
|
{ "winstore100", "Universal Windows App 10.0" },
|
|
|
{ "durango", "Durango" },
|
|
|
{ "orbis", "Orbis" },
|
|
|
@@ -389,17 +384,6 @@ function toolchain(_buildDir, _libDir)
|
|
|
premake.gcc.ar = orbisToolchain .. "ar"
|
|
|
location (path.join(_buildDir, "projects", _ACTION .. "-orbis"))
|
|
|
|
|
|
- elseif "qnx-arm" == _OPTIONS["gcc"] then
|
|
|
-
|
|
|
- if not os.getenv("QNX_HOST") then
|
|
|
- print("Set QNX_HOST environment variable.")
|
|
|
- end
|
|
|
-
|
|
|
- premake.gcc.cc = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-gcc"
|
|
|
- premake.gcc.cxx = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-g++"
|
|
|
- premake.gcc.ar = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-ar"
|
|
|
- location (path.join(_buildDir, "projects", _ACTION .. "-qnx-arm"))
|
|
|
-
|
|
|
elseif "rpi" == _OPTIONS["gcc"] then
|
|
|
location (path.join(_buildDir, "projects", _ACTION .. "-rpi"))
|
|
|
|
|
|
@@ -430,29 +414,6 @@ function toolchain(_buildDir, _libDir)
|
|
|
end
|
|
|
location (path.join(_buildDir, "projects", _ACTION .. "-clang"))
|
|
|
|
|
|
- elseif "winphone8" == _OPTIONS["vs"] then
|
|
|
- premake.vstudio.toolset = "v110_wp80"
|
|
|
- location (path.join(_buildDir, "projects", _ACTION .. "-winphone8"))
|
|
|
-
|
|
|
- elseif "winphone81" == _OPTIONS["vs"] then
|
|
|
- premake.vstudio.toolset = "v120_wp81"
|
|
|
- premake.vstudio.storeapp = "8.1"
|
|
|
- platforms { "ARM" }
|
|
|
- location (path.join(_buildDir, "projects", _ACTION .. "-winphone81"))
|
|
|
-
|
|
|
- elseif "winstore81" == _OPTIONS["vs"] then
|
|
|
- premake.vstudio.toolset = "v120"
|
|
|
- premake.vstudio.storeapp = "8.1"
|
|
|
- platforms { "ARM" }
|
|
|
- location (path.join(_buildDir, "projects", _ACTION .. "-winstore81"))
|
|
|
-
|
|
|
- elseif "winstore82" == _OPTIONS["vs"] then
|
|
|
- premake.vstudio.toolset = "v140"
|
|
|
- premake.vstudio.storeapp = "8.2"
|
|
|
-
|
|
|
- platforms { "ARM" }
|
|
|
- location (path.join(_buildDir, "projects", _ACTION .. "-winstore82"))
|
|
|
-
|
|
|
elseif "winstore100" == _OPTIONS["vs"] then
|
|
|
premake.vstudio.toolset = "v141"
|
|
|
premake.vstudio.storeapp = "10.0"
|
|
|
@@ -645,7 +606,7 @@ function toolchain(_buildDir, _libDir)
|
|
|
targetdir (path.join(_buildDir, "win64_" .. _ACTION .. "-clang/bin"))
|
|
|
objdir (path.join(_buildDir, "win64_" .. _ACTION .. "-clang/obj"))
|
|
|
|
|
|
- configuration { "winphone* or winstore*" }
|
|
|
+ configuration { "winstore*" }
|
|
|
removeflags {
|
|
|
"StaticRuntime",
|
|
|
"NoExceptions",
|
|
|
@@ -1219,20 +1180,6 @@ function toolchain(_buildDir, _libDir)
|
|
|
"-std=c++11",
|
|
|
}
|
|
|
|
|
|
- configuration { "qnx-arm" }
|
|
|
- targetdir (path.join(_buildDir, "qnx-arm/bin"))
|
|
|
- objdir (path.join(_buildDir, "qnx-arm/obj"))
|
|
|
- libdirs { path.join(_libDir, "lib/qnx-arm") }
|
|
|
--- includedirs { path.join(bxDir, "include/compat/qnx") }
|
|
|
- buildoptions {
|
|
|
- "-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
|
|
|
- "-Wunused-value",
|
|
|
- "-Wundef",
|
|
|
- }
|
|
|
- buildoptions_cpp {
|
|
|
- "-std=c++11",
|
|
|
- }
|
|
|
-
|
|
|
configuration { "rpi" }
|
|
|
targetdir (path.join(_buildDir, "rpi/bin"))
|
|
|
objdir (path.join(_buildDir, "rpi/obj"))
|
Branimir Karadžić