From 8e8fdf875d080f2bebedf25815768de02147f4be Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 24 Mar 2020 14:48:23 -0600 Subject: Windows/Cleanup: Remove VS2015 support from make.bat VS2015 has not been supported for a while now but make.bat still had some support for it. --- build_files/windows/autodetect_msvc.cmd | 3 -- build_files/windows/detect_msvc2015.cmd | 3 -- build_files/windows/detect_msvc_classic.cmd | 69 ----------------------------- build_files/windows/parse_arguments.cmd | 2 - build_files/windows/show_help.cmd | 4 +- 5 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 build_files/windows/detect_msvc2015.cmd delete mode 100644 build_files/windows/detect_msvc_classic.cmd (limited to 'build_files/windows') diff --git a/build_files/windows/autodetect_msvc.cmd b/build_files/windows/autodetect_msvc.cmd index c2884bc1fcd..85b3c095d1f 100644 --- a/build_files/windows/autodetect_msvc.cmd +++ b/build_files/windows/autodetect_msvc.cmd @@ -6,9 +6,6 @@ if %ERRORLEVEL% EQU 0 goto DetectionComplete call "%~dp0\detect_msvc2019.cmd" if %ERRORLEVEL% EQU 0 goto DetectionComplete -call "%~dp0\detect_msvc2015.cmd" -if %ERRORLEVEL% EQU 0 goto DetectionComplete - echo Compiler Detection failed. Use verbose switch for more information. exit /b 1 diff --git a/build_files/windows/detect_msvc2015.cmd b/build_files/windows/detect_msvc2015.cmd deleted file mode 100644 index 0818d1dfffc..00000000000 --- a/build_files/windows/detect_msvc2015.cmd +++ /dev/null @@ -1,3 +0,0 @@ -set BUILD_VS_VER=14 -set BUILD_VS_YEAR=2015 -call "%~dp0\detect_msvc_classic.cmd" \ No newline at end of file diff --git a/build_files/windows/detect_msvc_classic.cmd b/build_files/windows/detect_msvc_classic.cmd deleted file mode 100644 index 2910e3b7305..00000000000 --- a/build_files/windows/detect_msvc_classic.cmd +++ /dev/null @@ -1,69 +0,0 @@ -if NOT "%verbose%" == "" ( - echo Detecting msvc %BUILD_VS_YEAR% -) -set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC" -for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C -if DEFINED MSVC_VC_DIR ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% on Win64 detected at "%MSVC_VC_DIR%" - ) - goto msvc_detect_finally -) - -REM Check 32 bits -set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC" -for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C -if DEFINED MSVC_VC_DIR ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% on Win32 detected at "%MSVC_VC_DIR%" - ) - goto msvc_detect_finally -) -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% not found. -) -goto FAIL -:msvc_detect_finally -set VCVARS=%MSVC_VC_DIR%\vcvarsall.bat -if not exist "%VCVARS%" ( - echo "%VCVARS%" not found. - goto FAIL -) - -call "%vcvars%" %BUILD_ARCH% - -rem try msbuild -msbuild /version > NUL -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% msbuild found -) - -REM try the c++ compiler -cl 2> NUL 1>&2 -if errorlevel 1 ( - if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found - ) - goto FAIL -) - -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found -) -goto DetectionComplete - -:FAIL -exit /b 1 - -:DetectionComplete -if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% Detected successfully -) -exit /b 0 diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 5f60e321a56..4ee05bfde7d 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -66,8 +66,6 @@ if NOT "%1" == "" ( ) else if "%1" == "2019b" ( set BUILD_VS_YEAR=2019 set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools - ) else if "%1" == "2015" ( - set BUILD_VS_YEAR=2015 ) else if "%1" == "packagename" ( set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DCPACK_OVERRIDE_PACKAGENAME="%2" shift /1 diff --git a/build_files/windows/show_help.cmd b/build_files/windows/show_help.cmd index 2ac2f294074..ee5e9d9dbbd 100644 --- a/build_files/windows/show_help.cmd +++ b/build_files/windows/show_help.cmd @@ -27,11 +27,13 @@ echo - builddir [newdir] ^(override default build folder^) echo - 2017 ^(build with visual studio 2017^) echo - 2017pre ^(build with visual studio 2017 pre-release^) echo - 2017b ^(build with visual studio 2017 Build Tools^) +echo - 2019 ^(build with visual studio 2019^) +echo - 2019pre ^(build with visual studio 2019 pre-release^) +echo - 2019b ^(build with visual studio 2019 Build Tools^) echo. echo Experimental options echo - with_opengl_tests ^(enable both the render and draw opengl test suites^) -echo - 2015 ^(build with visual studio 2015^) echo - clang ^(enable building with clang^) echo - asan ^(enable asan when building with clang^) echo - ninja ^(enable building with ninja instead of msbuild^) -- cgit v1.2.3