From 4b4b6596799749fdd77f8aaf25e0b2f3289dba4a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 23 Nov 2015 10:01:21 +0100 Subject: Added MSBUILD support, msbuild.exe must be in path so update your tools (nw) --- scripts/toolchain.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scripts/toolchain.lua') 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 -- cgit v1.2.3-70-g09d2