summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/toolchain.lua
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-03 11:40:45 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-03 11:40:45 +0100
commit92f81361d64c720addf5d7e2528b3d1c675f65a4 (patch)
tree6640e797a7dd924e20f10ab0f009257e1d751fc8 /scripts/toolchain.lua
parent39afa0533a1349566aa7f144e042b24227285e9f (diff)
Initial conversion of core to C++14. Note that compilers are now limited to GCC 4.9.0 and up, Clang 3.4.0 and up, and VS2013 and up [Miodrag Milanovic]
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r--scripts/toolchain.lua9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index e6e2e0e773b..13fe67eac1d 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -42,10 +42,8 @@ newoption {
allowed = {
{ "intel-14", "Intel C++ Compiler XE 14.0" },
{ "intel-15", "Intel C++ Compiler XE 15.0" },
- { "vs2012-clang", "Clang 3.6" },
{ "vs2013-clang", "Clang 3.6" },
{ "vs2015-clang", "Clang 3.6" },
- { "vs2012-xp", "Visual Studio 2012 targeting XP" },
{ "vs2013-xp", "Visual Studio 2013 targeting XP" },
{ "vs2015-xp", "Visual Studio 2015 targeting XP" },
{ "winphone8", "Windows Phone 8.0" },
@@ -327,7 +325,7 @@ function toolchain(_buildDir, _subDir)
if "os2" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-os2")
end
- elseif _ACTION == "vs2012" or _ACTION == "vs2013" or _ACTION == "vs2015" then
+ elseif _ACTION == "vs2013" or _ACTION == "vs2015" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("LLVM-" .. _ACTION)
@@ -369,11 +367,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
end
- if ("vs2012-xp") == _OPTIONS["vs"] then
- premake.vstudio.toolset = ("v110_xp")
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
- end
-
if ("vs2013-xp") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("v120_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")