From 34d4c26e40c942a045fd807dbf6dcefa083a5e72 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 26 Oct 2021 11:07:34 +0200 Subject: [PATCH] Remove old VisualStudio --- makefile | 78 ---------------------------- scripts/genie.lua | 2 +- scripts/toolchain.lua | 115 ------------------------------------------ 3 files changed, 1 insertion(+), 194 deletions(-) diff --git a/makefile b/makefile index 465dc2f56de..c996542e0bd 100644 --- a/makefile +++ b/makefile @@ -1163,84 +1163,6 @@ windows_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-mingw-clang/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) -#------------------------------------------------- -# Visual Studio 2015 -#------------------------------------------------- - -.PHONY: vs2015 -vs2015: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2015 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2015/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2015_intel -vs2015_intel: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2015 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2015-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2015_xp -vs2015_xp: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2015-xp vs2015 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2015-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2015_uwp -vs2015_uwp: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2015 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2015-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2015_fastbuild -vs2015_fastbuild: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2015-fastbuild -ifdef FASTBUILD - $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2015-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) -endif - -#------------------------------------------------- -# Visual Studio 2017 -#------------------------------------------------- - -.PHONY: vs2017 -vs2017: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2017 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2017_intel -vs2017_intel: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2017 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2017_xp -vs2017_xp: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2017-xp vs2017 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2017_uwp -vs2017_uwp: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2017 -ifdef MSBUILD - $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) -endif - -.PHONY: vs2017_fastbuild -vs2017_fastbuild: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2017-fastbuild -ifdef FASTBUILD - $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2017-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) -endif - #------------------------------------------------- # Visual Studio 2019 #------------------------------------------------- diff --git a/scripts/genie.lua b/scripts/genie.lua index 607789ee82e..5d318e2d68a 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -542,7 +542,7 @@ configuration { "Release", "vsllvm" } "NoIncrementalLink", } --- Force VS2015/17 targets to use bundled SDL2 +-- Force Visual Studio 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/toolchain.lua b/scripts/toolchain.lua index 4aba7c8963c..df21f41c176 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -41,12 +41,7 @@ newoption { value = "toolset", description = "Choose VS toolset", allowed = { - { "intel-14", "Intel C++ Compiler XE 14.0" }, { "intel-15", "Intel C++ Compiler XE 15.0" }, - { "vs2015-clang", "Clang 3.6" }, - { "vs2015-xp", "Visual Studio 2015 targeting XP" }, - { "vs2017-clang", "Clang 3.6" }, - { "vs2017-xp", "Visual Studio 2017 targeting XP" }, { "clangcl", "Visual Studio 2019 using Clang/LLVM" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, @@ -227,116 +222,6 @@ function toolchain(_buildDir, _subDir) premake.gcc.ar = toolchainPrefix .. "ar" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang") end - elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then - - if (_ACTION .. "-clang") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("LLVM-" .. _ACTION) - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang") - end - - if "winphone8" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v110_wp80" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone8") - end - - if "winphone81" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v120_wp81" - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81") - end - - if "winstore81" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v120" - premake.vstudio.storeapp = "8.1" - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81") - end - - if "winstore82" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v140" - premake.vstudio.storeapp = "8.2" - - -- If needed, depending on GENie version, enable file-level configuration - if enablefilelevelconfig ~= nil then - enablefilelevelconfig() - end - - local action = premake.action.current() - action.vstudio.windowsTargetPlatformVersion = windowsPlatform - - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") - end - - if "intel-14" == _OPTIONS["vs"] then - premake.vstudio.toolset = "Intel C++ Compiler XE 14.0" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") - end - - if "intel-15" == _OPTIONS["vs"] then - premake.vstudio.toolset = "Intel C++ Compiler XE 15.0" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") - end - - if ("vs2015-xp") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v140_xp") - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") - end - elseif _ACTION == "vs2017" or _ACTION == "vs2017-fastbuild" then - - if (_ACTION .. "-clang") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("LLVM-" .. _ACTION) - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang") - end - - if "winphone8" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v110_wp80" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone8") - end - - if "winphone81" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v120_wp81" - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81") - end - - if "winstore81" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v120" - premake.vstudio.storeapp = "8.1" - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81") - end - - if "winstore82" == _OPTIONS["vs"] then - premake.vstudio.toolset = "v141" - premake.vstudio.storeapp = "8.2" - - -- If needed, depending on GENie version, enable file-level configuration - if enablefilelevelconfig ~= nil then - enablefilelevelconfig() - end - - local action = premake.action.current() - action.vstudio.windowsTargetPlatformVersion = windowsPlatform - - platforms { "ARM" } - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") - end - - if "intel-14" == _OPTIONS["vs"] then - premake.vstudio.toolset = "Intel C++ Compiler XE 14.0" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") - end - - if "intel-15" == _OPTIONS["vs"] then - premake.vstudio.toolset = "Intel C++ Compiler XE 15.0" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") - end - - if ("vs2017-xp") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v141_xp") - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") - end elseif _ACTION == "vs2019" or _ACTION == "vs2019-fastbuild" then if "clangcl" == _OPTIONS["vs"] then