ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 14:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Don't use the CFLAGS environment variable.

Browse source 
CMake has standard means of setting compiler flags, such as the
-DCMAKE_C_FLAGS command line for general-purpose flags, and
-DCMAKE_BUILD_TYPE for letting it choose reasonable release/debug/etc
defaults. Trying to emulate the configure script is incorrect and confusing
here.

Fixes #1819.
This commit is contained in:
Ryan C. Gordon 2021-09-27 23:31:23 -04:00
parent 114d1d46ac
commit f79ac6a8de
No known key found for this signature in database
GPG key ID: FA148B892AB48044
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -212,19 +212,8 @@ if(UNIX OR MINGW OR MSYS OR (USE_CLANG AND NOT WINDOWS) OR VITA)
set(OPT_DEF_LIBC ON) set(OPT_DEF_LIBC ON)
endif() endif()
# Default flags, if not set otherwise if(NOT ("$ENV{CFLAGS}" STREQUAL ""))
if("$ENV{CFLAGS}" STREQUAL "") message(WARNING "SDL's CMakeLists.txt no longer checks the CFLAGS environment. Please use CMake's CMAKE_C_FLAGS and CMAKE_BUILD_TYPE variables directly.")
if(CMAKE_BUILD_TYPE STREQUAL "")
if(USE_GCC OR USE_CLANG)
set(CMAKE_C_FLAGS "-g -O3")
endif()
endif()
else()
set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
list(APPEND EXTRA_CFLAGS "$ENV{CFLAGS}")
endif()
if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
endif() endif()
if(MSVC) if(MSVC)