We upgraded completely to VS 2015.

The code no longer compiles on VS 2013, removing that toolset.
This commit is contained in:
/dev/urandom 2016-01-04 19:40:32 +01:00
parent 069fb88517
commit 01f1d82d05
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E

View File

@ -51,6 +51,9 @@ solution "iw4x"
location ("./build") location ("./build")
configurations { "Normal", "Debug", "DebugStatic", "Release", "ReleaseStatic" } configurations { "Normal", "Debug", "DebugStatic", "Release", "ReleaseStatic" }
-- VS 2015 toolset only
toolset "msc-140"
project "iw4x" project "iw4x"
kind "SharedLib" kind "SharedLib"
language "C++" language "C++"
@ -61,12 +64,6 @@ solution "iw4x"
["Normal"] = "Debug" ["Normal"] = "Debug"
} }
-- Allow newer Microsoft toolsets but fall back to VS2013
if _ACTION == "vs2015" then
toolset "msc-140"
else
toolset "msc-120"
end
if not _OPTIONS["no-new-structure"] then if not _OPTIONS["no-new-structure"] then
vpaths { vpaths {