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

sync handling of subsystems II.

This commit is contained in:
pionere 2022-01-11 10:45:41 +01:00 committed by Ryan C. Gordon
parent 65e9415b98
commit eb80f2c65a
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -2563,7 +2563,7 @@ if(NOT HAVE_SDL_SENSORS)
set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
endif() endif()
if(NOT HAVE_SDL_LOADSO) if(NOT HAVE_SDL_LOADSO)
set(SDL_LOADSO_DISABLED 1) set(SDL_LOADSO_DUMMY 1)
file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c) file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${LOADSO_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${LOADSO_SOURCES})
endif() endif()
@ -2590,7 +2590,7 @@ if(NOT HAVE_SDL_THREADS)
set(SOURCE_FILES ${SOURCE_FILES} ${THREADS_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${THREADS_SOURCES})
endif() endif()
if(NOT HAVE_SDL_TIMERS) if(NOT HAVE_SDL_TIMERS)
set(SDL_TIMERS_DISABLED 1) set(SDL_TIMER_DUMMY 1)
file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/dummy/*.c) file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
endif() endif()

2
configure vendored
View File

@ -26931,7 +26931,7 @@ fi
if test x$have_timers != xyes; then if test x$have_timers != xyes; then
if test x$enable_timers = xyes; then if test x$enable_timers = xyes; then
$as_echo "#define SDL_TIMERS_DISABLED 1" >>confdefs.h $as_echo "#define SDL_TIMER_DUMMY 1" >>confdefs.h
fi fi
SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"

2
configure.ac
View File

@ -4588,7 +4588,7 @@ if test x$have_threads != xyes; then
fi fi
if test x$have_timers != xyes; then if test x$have_timers != xyes; then
if test x$enable_timers = xyes; then if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMERS_DISABLED, 1, [ ]) AC_DEFINE(SDL_TIMER_DUMMY, 1, [ ])
fi fi
SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
fi fi

4
src/SDL.c
View File

@ -208,7 +208,7 @@ SDL_InitSubSystem(Uint32 flags)
/* Initialize the timer subsystem */ /* Initialize the timer subsystem */
if ((flags & SDL_INIT_TIMER)){ if ((flags & SDL_INIT_TIMER)){
#if !SDL_TIMERS_DISABLED #if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY
if (SDL_PrivateShouldInitSubsystem(SDL_INIT_TIMER)) { if (SDL_PrivateShouldInitSubsystem(SDL_INIT_TIMER)) {
if (SDL_TimerInit() < 0) { if (SDL_TimerInit() < 0) {
goto quit_and_error; goto quit_and_error;
@ -402,7 +402,7 @@ SDL_QuitSubSystem(Uint32 flags)
} }
#endif #endif
#if !SDL_TIMERS_DISABLED #if !SDL_TIMERS_DISABLED && !SDL_TIMER_DUMMY
if ((flags & SDL_INIT_TIMER)) { if ((flags & SDL_INIT_TIMER)) {
if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_TIMER)) { if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_TIMER)) {
SDL_TimerQuit(); SDL_TimerQuit();

8
src/video/SDL_vulkan_internal.h
View File

@ -25,12 +25,10 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#if defined(SDL_LOADSO_DISABLED)
#undef SDL_VIDEO_VULKAN
#define SDL_VIDEO_VULKAN 0
#endif
#if SDL_VIDEO_VULKAN #if SDL_VIDEO_VULKAN
#if SDL_LOADSO_DISABLED || SDL_LOADSO_DUMMY
#error You should not be here.
#endif
#if SDL_VIDEO_DRIVER_ANDROID #if SDL_VIDEO_DRIVER_ANDROID
#define VK_USE_PLATFORM_ANDROID_KHR #define VK_USE_PLATFORM_ANDROID_KHR