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

Removed SDL_FILE_DISABLED 

This didn't actually do anything except break functionality on Apple platforms
main
Sam Lantinga 2024-01-17 08:43:11 -08:00
parent ac367be171
commit 3d951134a3
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -240,7 +240,6 @@ set(SDL_SUBSYSTEMS
Haptic Haptic
Hidapi Hidapi
Power Power
File
Filesystem Filesystem
Sensor Sensor
Locale Locale
@ -2052,11 +2051,7 @@ elseif(APPLE)
set(HAVE_SDL_MAIN_CALLBACKS TRUE) set(HAVE_SDL_MAIN_CALLBACKS TRUE)
endif() endif()
# Requires the darwin file implementation sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/cocoa/*.m")
if(SDL_FILE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/cocoa/*.m")
set(HAVE_SDL_FILE TRUE)
endif()
if(IOS OR TVOS OR MACOSX OR DARWIN) if(IOS OR TVOS OR MACOSX OR DARWIN)
sdl_sources("${SDL3_SOURCE_DIR}/src/video/SDL_video_capture_apple.m") sdl_sources("${SDL3_SOURCE_DIR}/src/video/SDL_video_capture_apple.m")
@ -2732,13 +2727,7 @@ elseif(N3DS)
set(HAVE_SDL_LOCALE TRUE) set(HAVE_SDL_LOCALE TRUE)
endif() endif()
# Requires the n3ds file implementation sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/n3ds/*.c")
if(SDL_FILE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/file/n3ds/*.c")
set(HAVE_SDL_FILE TRUE)
else()
message(FATAL_ERROR "SDL_FILE must be enabled to build on N3DS")
endif()
endif() endif()
# Platform-independent options # Platform-independent options

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

@ -257,7 +257,6 @@
/* Allow disabling of core subsystems */ /* Allow disabling of core subsystems */
#cmakedefine SDL_AUDIO_DISABLED @SDL_AUDIO_DISABLED@ #cmakedefine SDL_AUDIO_DISABLED @SDL_AUDIO_DISABLED@
#cmakedefine SDL_FILE_DISABLED @SDL_FILE_DISABLED@
#cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@ #cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@
#cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@ #cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@
#cmakedefine SDL_HIDAPI_DISABLED @SDL_HIDAPI_DISABLED@ #cmakedefine SDL_HIDAPI_DISABLED @SDL_HIDAPI_DISABLED@

2
src/file/SDL_rwops.c
View File

@ -528,7 +528,7 @@ SDL_RWops *SDL_RWFromFile(const char *file, const char *mode)
rwops->type = SDL_RWOPS_WINFILE; rwops->type = SDL_RWOPS_WINFILE;
#elif defined(HAVE_STDIO_H) #elif defined(HAVE_STDIO_H)
{ {
#if defined(__APPLE__) && !defined(SDL_FILE_DISABLED) // TODO: add dummy? #if defined(__APPLE__)
FILE *fp = SDL_OpenFPFromBundleOrFallback(file, mode); FILE *fp = SDL_OpenFPFromBundleOrFallback(file, mode);
#elif defined(__WINRT__) #elif defined(__WINRT__)
FILE *fp = NULL; FILE *fp = NULL;