https://git.reactos.org/?p=reactos.git;a=commitdiff;h=156b3bd0149a7caee67faebcfb09c77157ac55b3
commit 156b3bd0149a7caee67faebcfb09c77157ac55b3 Author: Victor Perevertkin <[email protected]> AuthorDate: Sat Apr 25 03:14:44 2020 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Mon May 4 21:47:37 2020 +0300 [REACTOS] Drop support for Visual Studio below 2015 --- README.md | 2 +- configure.cmd | 5 +---- sdk/cmake/msvc.cmake | 12 +++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bf96c76dab8..a200f9a5dc1 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). -Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). +Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). ### Binaries diff --git a/configure.cmd b/configure.cmd index c0fa3ac00d4..2d780760681 100755 --- a/configure.cmd +++ b/configure.cmd @@ -50,14 +50,11 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 - cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 - cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( - echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. + echo Error: Visual Studio version too old ^(before 14 ^(2015^)^) or version detection failed. goto quit ) set BUILD_ENVIRONMENT=VS diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ce526ed979f..01bbfee00e0 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -50,19 +50,17 @@ endif() # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 -if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") +if(ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") endif () # VS 12+ requires /FS when used in parallel compilations -if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) +if(NOT MSVC_IDE) add_compile_flags("/FS") endif () # VS14+ tries to use thread-safe initialization -if(MSVC_VERSION GREATER 1899) - add_compile_flags("/Zc:threadSafeInit-") -endif () +add_compile_flags("/Zc:threadSafeInit-") # HACK: Disable use of __CxxFrameHandler4 on VS 16.3+ (x64 only) # See https://developercommunity.visualstudio.com/content/problem/746534/visual-c-163-runtime-uses-an-unsupported-api-for-u.html @@ -112,8 +110,8 @@ add_compile_flags("/wd4018") add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced -# Not in Release mode and not with MSVC 2010 -if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT MSVC_VERSION LESS 1700)) +# Not in Release mode +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/we4189") endif()
