encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: fix check for -marm 

This fixes the following warning:
clang: warning: argument unused during compilation: '-marm' [-Wunused-command-line-argument]
This commit is contained in:
Anonymous Maarten 2022-10-06 00:55:37 +02:00 committed by Anonymous Maarten
parent 45da133999
commit 07225d2e26
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1187,10 +1187,13 @@ if(ANDROID)
# There seems to be no better way currently to set the ARM mode. # There seems to be no better way currently to set the ARM mode.
# see: https://issuetracker.google.com/issues/62264618 # see: https://issuetracker.google.com/issues/62264618
# Another option would be to set ARM mode to all compiled files # Another option would be to set ARM mode to all compiled files
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_FLAGS "-Werror=unused-command-line-argument")
check_c_compiler_flag(-marm HAVE_ARM_MODE) check_c_compiler_flag(-marm HAVE_ARM_MODE)
if(HAVE_ARM_MODE) if(HAVE_ARM_MODE)
set_source_files_properties(${SDL2_SOURCE_DIR}/src/atomic/SDL_spinlock.c PROPERTIES COMPILE_FLAGS -marm) set_property(SOURCE "${SDL2_SOURCE_DIR}/src/atomic/SDL_spinlock.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -marm")
endif() endif()
cmake_pop_check_state()
file(GLOB ANDROID_MAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/android/*.c) file(GLOB ANDROID_MAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/android/*.c)
list(APPEND SDLMAIN_SOURCES ${ANDROID_MAIN_SOURCES}) list(APPEND SDLMAIN_SOURCES ${ANDROID_MAIN_SOURCES})
@ -2373,10 +2376,13 @@ elseif(RISCOS)
elseif(VITA) elseif(VITA)
# SDL_spinlock.c Needs to be compiled in ARM mode. # SDL_spinlock.c Needs to be compiled in ARM mode.
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_FLAGS "-Werror=unused-command-line-argument")
check_c_compiler_flag(-marm HAVE_ARM_MODE) check_c_compiler_flag(-marm HAVE_ARM_MODE)
if(HAVE_ARM_MODE) if(HAVE_ARM_MODE)
set_source_files_properties(${SDL2_SOURCE_DIR}/src/atomic/SDL_spinlock.c PROPERTIES COMPILE_FLAGS -marm) set_property(SOURCE "${SDL2_SOURCE_DIR}/src/atomic/SDL_spinlock.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -marm")
endif() endif()
cmake_pop_check_state()
if(SDL_MISC) if(SDL_MISC)
file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/vita/*.c) file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/vita/*.c)