diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 2 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 5 | ||||
-rw-r--r-- | scripts/toolchain.lua | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 5a2acd931c1..208f633a8c9 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -486,7 +486,7 @@ configuration { "Release", "vs*" } "Optimize", } --- Force VS2013/15 targets to use bundled SDL2 +-- Force VS2015 targets to use bundled SDL2 if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then if _OPTIONS["with-bundled-sdl2"]==nil then _OPTIONS["with-bundled-sdl2"] = "1" diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 38667d4ae44..7cd71715225 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1043,11 +1043,6 @@ project "uv" "WIN32_LEAN_AND_MEAN", "_WIN32_WINNT=0x0502", } - if _ACTION == "vs2013" then - files { - MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", - } - end configuration { } files { MAME_DIR .. "3rdparty/libuv/src/win/async.c", diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index ff2f10ebbc2..fc19060a5c8 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -49,9 +49,7 @@ newoption { allowed = { { "intel-14", "Intel C++ Compiler XE 14.0" }, { "intel-15", "Intel C++ Compiler XE 15.0" }, - { "vs2013-clang", "Clang 3.6" }, { "vs2015-clang", "Clang 3.6" }, - { "vs2013-xp", "Visual Studio 2013 targeting XP" }, { "vs2015-xp", "Visual Studio 2015 targeting XP" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, @@ -333,7 +331,7 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20") end - elseif _ACTION == "vs2013" or _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then + elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then if (_ACTION .. "-clang") == _OPTIONS["vs"] then premake.vstudio.toolset = ("LLVM-" .. _ACTION) @@ -384,11 +382,6 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") end - if ("vs2013-xp") == _OPTIONS["vs"] then - 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") |