summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/toolchain.lua
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r--scripts/toolchain.lua19
1 files changed, 7 insertions, 12 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 966d55d1dbb..59e8bdb504a 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -141,11 +141,6 @@ function toolchain(_buildDir, _subDir)
end
if "linux-gcc" == _OPTIONS["gcc"] then
- -- Force gcc-4.2 on ubuntu-intrepid
- if _OPTIONS["distro"]=="ubuntu-intrepid" then
- premake.gcc.cc = "@gcc -V 4.2"
- premake.gcc.cxx = "@g++-4.2"
- end
premake.gcc.ar = "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
end
@@ -163,10 +158,10 @@ function toolchain(_buildDir, _subDir)
end
if "mingw32-gcc" == _OPTIONS["gcc"] then
- if not os.getenv("MINGW32") then
- print("Set MINGW32 envrionment variable.")
- end
if toolchainPrefix == nil or toolchainPrefix == "" then
+ if not os.getenv("MINGW32") then
+ print("Set MINGW32 environment variable.")
+ end
toolchainPrefix = "$(MINGW32)/bin/i686-w64-mingw32-"
end
premake.gcc.cc = toolchainPrefix .. "gcc"
@@ -176,10 +171,10 @@ function toolchain(_buildDir, _subDir)
end
if "mingw64-gcc" == _OPTIONS["gcc"] then
- if not os.getenv("MINGW64") then
- print("Set MINGW64 envrionment variable.")
- end
if toolchainPrefix == nil or toolchainPrefix == "" then
+ if not os.getenv("MINGW64") then
+ print("Set MINGW64 environment variable.")
+ end
toolchainPrefix = "$(MINGW64)/bin/x86_64-w64-mingw32-"
end
premake.gcc.cc = toolchainPrefix .. "gcc"
@@ -211,7 +206,7 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
- elseif _ACTION == "vs2019" then
+ elseif _ACTION == "vs2022" then
if "clangcl" == _OPTIONS["vs"] then
premake.vstudio.toolset = ("ClangCL")