Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Remove obsolete '_ROSBE_VERSION' checks

Browse source 
following upgrade to RosBE (2.1 and now) 2.2.
This commit is contained in:
Serge Gautherie 2020-06-24 20:41:44 +02:00 committed by Mark Jansen
parent e06ec0a594
commit e6956dd3b1
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toolchain-clang.cmake
View file

@ -10,11 +10,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
else() else()
if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1) set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
else()
set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
endif()
endif() endif()
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")

6
toolchain-gcc.cmake
View file

@ -16,11 +16,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
else() else()
if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1) set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
else()
set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
endif()
endif() endif()
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")