Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 20:18:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONFIGURE][CMAKE] Remove Visual Studio 9 (2008) support

Browse source 
ReactOS does not compile anymore with it.
VS9 is already officially unsupported.

CORE-11836
This commit is contained in:
Serge Gautherie 2018-05-25 02:49:08 +02:00 committed by Mark Jansen
parent 9822462946
commit 695547cd8c
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.cmd
View file

@ -62,7 +62,6 @@ if defined ROS_ARCH (
cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm cl 2>&1 | find "ARM" > NUL && set ARCH=arm
cl 2>&1 | find "15.00." > NUL && set VS_VERSION=9
cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 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 "17.00." > NUL && set VS_VERSION=11
cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12
@ -72,7 +71,7 @@ if defined ROS_ARCH (
cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15
if not defined VS_VERSION ( if not defined VS_VERSION (
echo Error: Visual Studio version too old or version detection failed. echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed.
goto quit goto quit
) )
set BUILD_ENVIRONMENT=VS set BUILD_ENVIRONMENT=VS
@ -138,13 +137,7 @@ REM Parse command line parameters
set VS_VERSION=%3 set VS_VERSION=%3
echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH!
) )
if "!VS_VERSION!" == "9" ( if "!VS_VERSION!" == "10" (
if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
) else (
set CMAKE_GENERATOR="Visual Studio 9 2008"
)
) else if "!VS_VERSION!" == "10" (
if "!ARCH!" == "amd64" ( if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 10 Win64" set CMAKE_GENERATOR="Visual Studio 10 Win64"
) else ( ) else (

11
sdk/cmake/msvc.cmake
View file

@ -149,15 +149,8 @@ if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
# For VS builds we'll only have en-US in resource files # For VS builds we'll only have en-US in resource files
add_definitions(/DLANGUAGE_EN_US) add_definitions(/DLANGUAGE_EN_US)
else() else()
# Only VS 10+ resource compiler supports /nologo
# CMAKE_CXX_SIMULATE_VERSION is a similar check for our clang-cl builds
if((MSVC_VERSION GREATER 1599) OR (CMAKE_CXX_SIMULATE_VERSION VERSION_GREATER 15.99))
set(rc_nologo_flag "/nologo")
else()
set(rc_nologo_flag)
endif()
if(CMAKE_VERSION VERSION_LESS 3.4.0) if(CMAKE_VERSION VERSION_LESS 3.4.0)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>")
if(ARCH STREQUAL "arm") if(ARCH STREQUAL "arm")
set(CMAKE_ASM_COMPILE_OBJECT set(CMAKE_ASM_COMPILE_OBJECT
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
@ -168,7 +161,7 @@ else()
"<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
endif() endif()
else() else()
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>")
if(ARCH STREQUAL "arm") if(ARCH STREQUAL "arm")
set(CMAKE_ASM_COMPILE_OBJECT set(CMAKE_ASM_COMPILE_OBJECT
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"