diff options
author | 2015-11-23 10:01:21 +0100 | |
---|---|---|
committer | 2015-11-23 10:01:21 +0100 | |
commit | 4b4b6596799749fdd77f8aaf25e0b2f3289dba4a (patch) | |
tree | 9dcff9fe8408e702dd8e497642125001768f856b /scripts/toolchain.lua | |
parent | 247036c2e562a3cfd9457dd3482fc74d577d3001 (diff) |
Added MSBUILD support, msbuild.exe must be in path so update your tools (nw)
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r-- | scripts/toolchain.lua | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 08712050751..532fac535e8 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -44,8 +44,10 @@ newoption { { "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" }, { "winphone81", "Windows Phone 8.1" }, { "winstore81", "Windows Store 8.1" }, @@ -376,6 +378,11 @@ function toolchain(_buildDir, _subDir) premake.vstudio.toolset = ("v120_xp") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") end + + if ("vs2015-xp") == _OPTIONS["vs"] then + premake.vstudio.toolset = ("v140_xp") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") + end elseif _ACTION == "xcode4" then if "osx" == _OPTIONS["xcode"] then |