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

Removed SDL_FILESYSTEM_DISABLED

main
Sam Lantinga 2024-01-17 08:50:48 -08:00
parent 3d951134a3
commit 6efadfdb77
2 changed files with 36 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
CMakeLists.txt
View File

@ -240,7 +240,6 @@ set(SDL_SUBSYSTEMS
Haptic Haptic
Hidapi Hidapi
Power Power
Filesystem
Sensor Sensor
Locale Locale
Misc Misc
@ -1247,11 +1246,9 @@ if(ANDROID)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_ANDROID 1)
set(SDL_FILESYSTEM_ANDROID 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/android/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/android/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_HAPTIC) if(SDL_HAPTIC)
set(SDL_HAPTIC_ANDROID 1) set(SDL_HAPTIC_ANDROID 1)
@ -1405,11 +1402,9 @@ elseif(EMSCRIPTEN)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_EMSCRIPTEN 1)
set(SDL_FILESYSTEM_EMSCRIPTEN 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/emscripten/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/emscripten/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_EMSCRIPTEN 1) set(SDL_JOYSTICK_EMSCRIPTEN 1)
@ -1706,11 +1701,9 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
set(HAVE_SDL_LOCALE TRUE) set(HAVE_SDL_LOCALE TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_UNIX 1)
set(SDL_FILESYSTEM_UNIX 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/unix/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/unix/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
set(SDL_TIMER_UNIX 1) set(SDL_TIMER_UNIX 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
@ -1925,15 +1918,13 @@ elseif(WINDOWS)
set(HAVE_SDL_LOCALE TRUE) set(HAVE_SDL_LOCALE TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_WINDOWS 1)
set(SDL_FILESYSTEM_WINDOWS 1) if(WINDOWS_STORE)
if(WINDOWS_STORE) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/winrt/*.cpp")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/winrt/*.cpp") else()
else() sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/windows/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/windows/*.c")
endif()
set(HAVE_SDL_FILESYSTEM TRUE)
endif() endif()
set(HAVE_SDL_FILESYSTEM TRUE)
# Libraries for Win32 native and MinGW # Libraries for Win32 native and MinGW
if(NOT WINDOWS_STORE) if(NOT WINDOWS_STORE)
@ -2159,11 +2150,9 @@ elseif(APPLE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
set(HAVE_SDL_TIMERS TRUE) set(HAVE_SDL_TIMERS TRUE)
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_COCOA 1)
set(SDL_FILESYSTEM_COCOA 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/cocoa/*.m")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/cocoa/*.m") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_SENSOR) if(SDL_SENSOR)
if(IOS OR VISIONOS) if(IOS OR VISIONOS)
@ -2345,11 +2334,9 @@ elseif(HAIKU)
endif() endif()
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_HAIKU 1)
set(SDL_FILESYSTEM_HAIKU 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/haiku/*.cc")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/haiku/*.cc") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
set(SDL_TIMER_HAIKU 1) set(SDL_TIMER_HAIKU 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/haiku/*.c") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/haiku/*.c")
@ -2383,11 +2370,9 @@ elseif(RISCOS)
set(HAVE_SDL_VIDEO TRUE) set(HAVE_SDL_VIDEO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_RISCOS 1)
set(SDL_FILESYSTEM_RISCOS 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/riscos/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/riscos/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
set(SDL_TIMER_UNIX 1) set(SDL_TIMER_UNIX 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c") sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
@ -2424,11 +2409,9 @@ elseif(VITA)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_VITA 1)
set(SDL_FILESYSTEM_VITA 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/vita/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/vita/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_VITA 1) set(SDL_JOYSTICK_VITA 1)
@ -2562,11 +2545,9 @@ elseif(PSP)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_PSP 1)
set(SDL_FILESYSTEM_PSP 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/psp/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/psp/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_PSP 1) set(SDL_JOYSTICK_PSP 1)
@ -2627,11 +2608,9 @@ elseif(PS2)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_PS2 1)
set(SDL_FILESYSTEM_PS2 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/ps2/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/ps2/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_PS2 1) set(SDL_JOYSTICK_PS2 1)
@ -2680,11 +2659,9 @@ elseif(N3DS)
set(HAVE_SDL_AUDIO TRUE) set(HAVE_SDL_AUDIO TRUE)
endif() endif()
if(SDL_FILESYSTEM) set(SDL_FILESYSTEM_N3DS 1)
set(SDL_FILESYSTEM_N3DS 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/n3ds/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/n3ds/*.c") set(HAVE_SDL_FILESYSTEM TRUE)
set(HAVE_SDL_FILESYSTEM TRUE)
endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
set(SDL_JOYSTICK_N3DS 1) set(SDL_JOYSTICK_N3DS 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_THREADS_DISABLED @SDL_THREADS_DISABLED@
#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@ #cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@
#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@ #cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@
#cmakedefine SDL_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@
#cmakedefine SDL_LOCALE_DISABLED @SDL_LOCALE_DISABLED@ #cmakedefine SDL_LOCALE_DISABLED @SDL_LOCALE_DISABLED@
#cmakedefine SDL_MISC_DISABLED @SDL_MISC_DISABLED@ #cmakedefine SDL_MISC_DISABLED @SDL_MISC_DISABLED@