geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed SDL_MISC_DISABLED

main
Sam Lantinga 2024-01-17 08:57:27 -08:00
parent 20fa5e6ad0
commit 130b361904
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
CMakeLists.txt
View File

@ -241,7 +241,6 @@ set(SDL_SUBSYSTEMS
Hidapi
Power
Sensor
Misc
)
foreach(_SUB IN LISTS SDL_SUBSYSTEMS)
string(TOUPPER ${_SUB} _OPT)
@ -1212,10 +1211,8 @@ if(ANDROID)
sdl_sources("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_property(SOURCE "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement")
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/android/*.c")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/android/*.c")
set(HAVE_SDL_MISC TRUE)
# SDL_spinlock.c Needs to be compiled in ARM mode.
# There seems to be no better way currently to set the ARM mode.
@ -1388,10 +1385,8 @@ elseif(EMSCRIPTEN)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/main/emscripten/*.c")
set(HAVE_SDL_MAIN_CALLBACKS TRUE)
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/emscripten/*.c")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/emscripten/*.c")
set(HAVE_SDL_MISC TRUE)
if(SDL_AUDIO)
set(SDL_AUDIO_DRIVER_EMSCRIPTEN 1)
@ -1678,10 +1673,8 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
endif()
endif()
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/unix/*.c")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/unix/*.c")
set(HAVE_SDL_MISC TRUE)
if(SDL_POWER)
if(LINUX)
@ -1749,14 +1742,12 @@ elseif(WINDOWS)
endif()
endif()
if(SDL_MISC)
if(WINDOWS_STORE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/winrt/*.cpp")
else()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/windows/*.c")
endif()
set(HAVE_SDL_MISC TRUE)
if(WINDOWS_STORE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/winrt/*.cpp")
else()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/windows/*.c")
endif()
set(HAVE_SDL_MISC TRUE)
# Check for DirectX
if(SDL_DIRECTX)
@ -2039,14 +2030,12 @@ elseif(APPLE)
sdl_sources("${SDL3_SOURCE_DIR}/src/video/SDL_video_capture_apple.m")
endif()
if(SDL_MISC)
if(IOS OR TVOS OR VISIONOS)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/ios/*.m")
else()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/macos/*.m")
endif()
set(HAVE_SDL_MISC TRUE)
if(IOS OR TVOS OR VISIONOS)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/ios/*.m")
else()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/macos/*.m")
endif()
set(HAVE_SDL_MISC TRUE)
if(SDL_AUDIO)
set(SDL_AUDIO_DRIVER_COREAUDIO 1)
@ -2303,10 +2292,8 @@ elseif(HAIKU)
set(HAVE_SDL_JOYSTICK TRUE)
endif()
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/haiku/*.cc")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/haiku/*.cc")
set(HAVE_SDL_MISC TRUE)
if(SDL_VIDEO)
set(SDL_VIDEO_DRIVER_HAIKU 1)
@ -2346,10 +2333,8 @@ elseif(HAIKU)
sdl_link_dependency(base LIBS root be media game device textencoding)
elseif(RISCOS)
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/riscos/*.c")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/riscos/*.c")
set(HAVE_SDL_MISC TRUE)
if(SDL_VIDEO)
set(SDL_VIDEO_DRIVER_RISCOS 1)
@ -2385,10 +2370,8 @@ elseif(VITA)
set_property(SOURCE "${SDL3_SOURCE_DIR}/src/atomic/SDL_spinlock.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -marm")
endif()
if(SDL_MISC)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/vita/*.c")
set(HAVE_SDL_MISC TRUE)
endif()
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/misc/vita/*.c")
set(HAVE_SDL_MISC TRUE)
if(SDL_AUDIO)
set(SDL_AUDIO_DRIVER_VITA 1)

1
include/build_config/SDL_build_config.h.cmake
View File

@ -265,7 +265,6 @@
#cmakedefine SDL_THREADS_DISABLED @SDL_THREADS_DISABLED@
#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@
#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@
#cmakedefine SDL_MISC_DISABLED @SDL_MISC_DISABLED@
/* Enable various audio drivers */
#cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@