From 6efadfdb77608c8725936519b4bb003a9e991f58 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 17 Jan 2024 08:50:48 -0800
Subject: [PATCH] Removed SDL_FILESYSTEM_DISABLED
---
CMakeLists.txt | 95 +++++++------------
include/build_config/SDL_build_config.h.cmake | 1 -
2 files changed, 36 insertions(+), 60 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67eebe1502c1..2d2fd8d05a64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,6 @@ set(SDL_SUBSYSTEMS
Haptic
Hidapi
Power
- Filesystem
Sensor
Locale
Misc
@@ -1247,11 +1246,9 @@ if(ANDROID)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_ANDROID 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/android/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_ANDROID 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/android/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_HAPTIC)
set(SDL_HAPTIC_ANDROID 1)
@@ -1405,11 +1402,9 @@ elseif(EMSCRIPTEN)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_EMSCRIPTEN 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/emscripten/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_EMSCRIPTEN 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/emscripten/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_JOYSTICK)
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)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_UNIX 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/unix/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_UNIX 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/unix/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
set(SDL_TIMER_UNIX 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
@@ -1925,15 +1918,13 @@ elseif(WINDOWS)
set(HAVE_SDL_LOCALE TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_WINDOWS 1)
- if(WINDOWS_STORE)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/winrt/*.cpp")
- else()
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/windows/*.c")
- endif()
- set(HAVE_SDL_FILESYSTEM TRUE)
+ set(SDL_FILESYSTEM_WINDOWS 1)
+ if(WINDOWS_STORE)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/winrt/*.cpp")
+ else()
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/windows/*.c")
endif()
+ set(HAVE_SDL_FILESYSTEM TRUE)
# Libraries for Win32 native and MinGW
if(NOT WINDOWS_STORE)
@@ -2159,11 +2150,9 @@ elseif(APPLE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
set(HAVE_SDL_TIMERS TRUE)
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_COCOA 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/cocoa/*.m")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_COCOA 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/cocoa/*.m")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_SENSOR)
if(IOS OR VISIONOS)
@@ -2345,11 +2334,9 @@ elseif(HAIKU)
endif()
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_HAIKU 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/haiku/*.cc")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_HAIKU 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/haiku/*.cc")
+ set(HAVE_SDL_FILESYSTEM TRUE)
set(SDL_TIMER_HAIKU 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/haiku/*.c")
@@ -2383,11 +2370,9 @@ elseif(RISCOS)
set(HAVE_SDL_VIDEO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_RISCOS 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/riscos/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_RISCOS 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/riscos/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
set(SDL_TIMER_UNIX 1)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/timer/unix/*.c")
@@ -2424,11 +2409,9 @@ elseif(VITA)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_VITA 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/vita/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_VITA 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/vita/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_JOYSTICK)
set(SDL_JOYSTICK_VITA 1)
@@ -2562,11 +2545,9 @@ elseif(PSP)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_PSP 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/psp/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_PSP 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/psp/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_JOYSTICK)
set(SDL_JOYSTICK_PSP 1)
@@ -2627,11 +2608,9 @@ elseif(PS2)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_PS2 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/ps2/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_PS2 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/ps2/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_JOYSTICK)
set(SDL_JOYSTICK_PS2 1)
@@ -2680,11 +2659,9 @@ elseif(N3DS)
set(HAVE_SDL_AUDIO TRUE)
endif()
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_N3DS 1)
- sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/n3ds/*.c")
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
+ set(SDL_FILESYSTEM_N3DS 1)
+ sdl_glob_sources("${SDL3_SOURCE_DIR}/src/filesystem/n3ds/*.c")
+ set(HAVE_SDL_FILESYSTEM TRUE)
if(SDL_JOYSTICK)
set(SDL_JOYSTICK_N3DS 1)
diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake
index 5e2c7aed81cf..fdfbb33fd30c 100644
--- a/include/build_config/SDL_build_config.h.cmake
+++ b/include/build_config/SDL_build_config.h.cmake
@@ -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_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@
#cmakedefine SDL_LOCALE_DISABLED @SDL_LOCALE_DISABLED@
#cmakedefine SDL_MISC_DISABLED @SDL_MISC_DISABLED@