From 10e860e4e4828934135e74e11b0538fad8388dab Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 13:12:53 +0100 Subject: [PATCH 01/10] build_configs: remove unused macros Those are only used in build_config files that define them themselves, or not used at all. --- include/build_config/SDL_build_config.h.cmake | 28 ------------------- .../build_config/SDL_build_config_android.h | 13 +++------ include/build_config/SDL_build_config_ios.h | 11 ++------ include/build_config/SDL_build_config_macos.h | 11 ++------ .../build_config/SDL_build_config_minimal.h | 1 - .../build_config/SDL_build_config_windows.h | 15 ++-------- .../build_config/SDL_build_config_wingdk.h | 13 ++------- include/build_config/SDL_build_config_xbox.h | 15 ++-------- 8 files changed, 16 insertions(+), 91 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index e131e9afeb464..5de195b4d6427 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -59,7 +59,6 @@ #cmakedefine HAVE_MEMORY_H 1 #cmakedefine HAVE_SIGNAL_H 1 #cmakedefine HAVE_STDARG_H 1 -#cmakedefine HAVE_STDBOOL_H 1 #cmakedefine HAVE_STDDEF_H 1 #cmakedefine HAVE_STDINT_H 1 #cmakedefine HAVE_STDIO_H 1 @@ -73,10 +72,7 @@ /* C library functions */ #cmakedefine HAVE_DLOPEN 1 #cmakedefine HAVE_MALLOC 1 -#cmakedefine HAVE_CALLOC 1 -#cmakedefine HAVE_REALLOC 1 #cmakedefine HAVE_FDATASYNC 1 -#cmakedefine HAVE_FREE 1 #cmakedefine HAVE_GETENV 1 #cmakedefine HAVE_GETHOSTNAME 1 #cmakedefine HAVE_SETENV 1 @@ -92,8 +88,6 @@ #cmakedefine HAVE_WCSNLEN 1 #cmakedefine HAVE_WCSLCPY 1 #cmakedefine HAVE_WCSLCAT 1 -#cmakedefine HAVE__WCSDUP 1 -#cmakedefine HAVE_WCSDUP 1 #cmakedefine HAVE_WCSSTR 1 #cmakedefine HAVE_WCSCMP 1 #cmakedefine HAVE_WCSNCMP 1 @@ -104,8 +98,6 @@ #cmakedefine HAVE_STRLCAT 1 #cmakedefine HAVE_STRPBRK 1 #cmakedefine HAVE__STRREV 1 -#cmakedefine HAVE__STRUPR 1 -#cmakedefine HAVE__STRLWR 1 #cmakedefine HAVE_INDEX 1 #cmakedefine HAVE_RINDEX 1 #cmakedefine HAVE_STRCHR 1 @@ -128,8 +120,6 @@ #cmakedefine HAVE_ATOF 1 #cmakedefine HAVE_STRCMP 1 #cmakedefine HAVE_STRNCMP 1 -#cmakedefine HAVE_STRCASESTR 1 -#cmakedefine HAVE_SSCANF 1 #cmakedefine HAVE_VSSCANF 1 #cmakedefine HAVE_VSNPRINTF 1 #cmakedefine HAVE_ACOS 1 @@ -219,8 +209,6 @@ #cmakedefine HAVE_DBUS_DBUS_H 1 #cmakedefine HAVE_FCITX 1 #cmakedefine HAVE_IBUS_IBUS_H 1 -#cmakedefine HAVE_SYS_INOTIFY_H 1 -#cmakedefine HAVE_INOTIFY_INIT 1 #cmakedefine HAVE_INOTIFY_INIT1 1 #cmakedefine HAVE_INOTIFY 1 #cmakedefine HAVE_LIBUSB 1 @@ -230,7 +218,6 @@ #cmakedefine HAVE_LIBUDEV_H 1 #cmakedefine HAVE_LIBDECOR_H 1 -#cmakedefine HAVE_D3D11_H @HAVE_D3D11_H@ #cmakedefine HAVE_DDRAW_H @HAVE_DDRAW_H@ #cmakedefine HAVE_DSOUND_H @HAVE_DSOUND_H@ #cmakedefine HAVE_DINPUT_H @HAVE_DINPUT_H@ @@ -241,9 +228,7 @@ #cmakedefine HAVE_DXGI1_6_H @HAVE_DXGI1_6_H@ #cmakedefine HAVE_MMDEVICEAPI_H @HAVE_MMDEVICEAPI_H@ -#cmakedefine HAVE_AUDIOCLIENT_H @HAVE_AUDIOCLIENT_H@ #cmakedefine HAVE_TPCSHRD_H @HAVE_TPCSHRD_H@ -#cmakedefine HAVE_SENSORSAPI_H @HAVE_SENSORSAPI_H@ #cmakedefine HAVE_ROAPI_H @HAVE_ROAPI_H@ #cmakedefine HAVE_SHELLSCALINGAPI_H @HAVE_SHELLSCALINGAPI_H@ @@ -344,7 +329,6 @@ /* Enable various shared object loading systems */ #cmakedefine SDL_LOADSO_DLOPEN @SDL_LOADSO_DLOPEN@ #cmakedefine SDL_LOADSO_DUMMY @SDL_LOADSO_DUMMY@ -#cmakedefine SDL_LOADSO_LDG @SDL_LOADSO_LDG@ #cmakedefine SDL_LOADSO_WINDOWS @SDL_LOADSO_WINDOWS@ /* Enable various threading systems */ @@ -369,7 +353,6 @@ /* Enable various timer systems */ #cmakedefine SDL_TIMER_HAIKU @SDL_TIMER_HAIKU@ -#cmakedefine SDL_TIMER_DUMMY @SDL_TIMER_DUMMY@ #cmakedefine SDL_TIMER_UNIX @SDL_TIMER_UNIX@ #cmakedefine SDL_TIMER_WINDOWS @SDL_TIMER_WINDOWS@ #cmakedefine SDL_TIMER_VITA @SDL_TIMER_VITA@ @@ -441,13 +424,10 @@ #cmakedefine SDL_VIDEO_OPENGL @SDL_VIDEO_OPENGL@ #cmakedefine SDL_VIDEO_OPENGL_ES @SDL_VIDEO_OPENGL_ES@ #cmakedefine SDL_VIDEO_OPENGL_ES2 @SDL_VIDEO_OPENGL_ES2@ -#cmakedefine SDL_VIDEO_OPENGL_BGL @SDL_VIDEO_OPENGL_BGL@ #cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@ #cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@ #cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@ #cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@ -#cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@ -#cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@ /* Enable Vulkan support */ #cmakedefine SDL_VIDEO_VULKAN @SDL_VIDEO_VULKAN@ @@ -489,7 +469,6 @@ #cmakedefine SDL_FILESYSTEM_N3DS @SDL_FILESYSTEM_N3DS@ /* Enable system storage support */ -#cmakedefine SDL_STORAGE_GENERIC @SDL_STORAGE_GENERIC@ #cmakedefine SDL_STORAGE_STEAM @SDL_STORAGE_STEAM@ /* Enable system FSops support */ @@ -512,12 +491,6 @@ /* Enable dialog subsystem */ #cmakedefine SDL_DIALOG_DUMMY @SDL_DIALOG_DUMMY@ -/* Enable misc subsystem */ -#cmakedefine SDL_MISC_DUMMY @SDL_MISC_DUMMY@ - -/* Enable locale subsystem */ -#cmakedefine SDL_LOCALE_DUMMY @SDL_LOCALE_DUMMY@ - /* Enable assembly routines */ #cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@ @@ -557,7 +530,6 @@ typedef unsigned __int64 uintptr_t; #else typedef unsigned int uintptr_t; #endif -#define _UINTPTR_T_DEFINED #endif #endif /* Visual Studio 2008 */ #endif /* !_STDINT_H_ && !HAVE_STDINT_H */ diff --git a/include/build_config/SDL_build_config_android.h b/include/build_config/SDL_build_config_android.h index 34f26270e9012..50e0414fd74ae 100644 --- a/include/build_config/SDL_build_config_android.h +++ b/include/build_config/SDL_build_config_android.h @@ -41,8 +41,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -54,11 +53,8 @@ /* C library functions */ #define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FDATASYNC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 +#define HAVE_FDATASYNC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_PUTENV 1 @@ -85,8 +81,7 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASESTR 1 +#define HAVE_STRNCMP 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 #define HAVE_ACOS 1 diff --git a/include/build_config/SDL_build_config_ios.h b/include/build_config/SDL_build_config_ios.h index 1c58001820c06..7b81c01b25471 100644 --- a/include/build_config/SDL_build_config_ios.h +++ b/include/build_config/SDL_build_config_ios.h @@ -33,8 +33,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -46,10 +45,7 @@ /* C library functions */ #define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_PUTENV 1 @@ -77,8 +73,7 @@ #define HAVE_ATOF 1 #define HAVE_STRCMP 1 #define HAVE_STRNCMP 1 -#define HAVE_STRPBRK 1 -#define HAVE_STRCASESTR 1 +#define HAVE_STRPBRK 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 #define HAVE_ACOS 1 diff --git a/include/build_config/SDL_build_config_macos.h b/include/build_config/SDL_build_config_macos.h index 08bbd81d8c532..6323355bac99b 100644 --- a/include/build_config/SDL_build_config_macos.h +++ b/include/build_config/SDL_build_config_macos.h @@ -38,8 +38,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -51,10 +50,7 @@ /* C library functions */ #define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_SETENV 1 @@ -82,8 +78,7 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASESTR 1 +#define HAVE_STRNCMP 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 #define HAVE_ACOS 1 diff --git a/include/build_config/SDL_build_config_minimal.h b/include/build_config/SDL_build_config_minimal.h index 962dee35189e9..d22567a95a46c 100644 --- a/include/build_config/SDL_build_config_minimal.h +++ b/include/build_config/SDL_build_config_minimal.h @@ -51,7 +51,6 @@ typedef unsigned __int64 uintptr_t; #else typedef unsigned int uintptr_t; #endif -#define _UINTPTR_T_DEFINED #endif #else #define HAVE_STDINT_H 1 diff --git a/include/build_config/SDL_build_config_windows.h b/include/build_config/SDL_build_config_windows.h index 24e21f88f60cd..9522c91d41fdb 100644 --- a/include/build_config/SDL_build_config_windows.h +++ b/include/build_config/SDL_build_config_windows.h @@ -69,7 +69,6 @@ typedef unsigned __int64 uintptr_t; #else typedef unsigned int uintptr_t; #endif -#define _UINTPTR_T_DEFINED #endif #else #define HAVE_STDINT_H 1 @@ -124,7 +123,6 @@ typedef unsigned int uintptr_t; #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 #define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDIO_H 1 #define HAVE_STDLIB_H 1 @@ -132,10 +130,7 @@ typedef unsigned int uintptr_t; #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -143,9 +138,6 @@ typedef unsigned int uintptr_t; #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 #define HAVE__STRREV 1 -/* These functions have security warnings, so we won't use them */ -/* #undef HAVE__STRUPR */ -/* #undef HAVE__STRLWR */ #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 @@ -160,9 +152,7 @@ typedef unsigned int uintptr_t; #define HAVE_ATOF 1 #define HAVE_STRCMP 1 #define HAVE_STRNCMP 1 -#define HAVE_STRPBRK 1 -#define HAVE__WCSDUP 1 -#define HAVE_SSCANF 1 +#define HAVE_STRPBRK 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 #define HAVE_ACOS 1 @@ -232,7 +222,6 @@ typedef unsigned int uintptr_t; #define SDL_AUDIO_DRIVER_WASAPI 1 #endif #define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_WINMM 1 #define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DUMMY 1 diff --git a/include/build_config/SDL_build_config_wingdk.h b/include/build_config/SDL_build_config_wingdk.h index 5b7ebf1ddec75..ec055e1ec5869 100644 --- a/include/build_config/SDL_build_config_wingdk.h +++ b/include/build_config/SDL_build_config_wingdk.h @@ -63,7 +63,6 @@ #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 #define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -73,10 +72,7 @@ /* C library functions */ #define HAVE_LIBC 1 -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -84,9 +80,6 @@ #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 #define HAVE__STRREV 1 -/* These functions have security warnings, so we won't use them */ -/* #undef HAVE__STRUPR */ -/* #undef HAVE__STRLWR */ #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 @@ -100,8 +93,7 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE__WCSDUP 1 +#define HAVE_STRNCMP 1 #define HAVE_ACOS 1 #define HAVE_ASIN 1 #define HAVE_ATAN 1 @@ -160,7 +152,6 @@ #define SDL_AUDIO_DRIVER_WASAPI 1 #endif #define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_WINMM 1 #define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DUMMY 1 diff --git a/include/build_config/SDL_build_config_xbox.h b/include/build_config/SDL_build_config_xbox.h index 82b4f3c11a825..e2f0788ffe9cb 100644 --- a/include/build_config/SDL_build_config_xbox.h +++ b/include/build_config/SDL_build_config_xbox.h @@ -39,7 +39,6 @@ /* #define HAVE_DXGI_H 1 */ #define HAVE_XINPUT_H 1 /*#define HAVE_WINDOWS_GAMING_INPUT_H 1*/ -/*#define HAVE_D3D11_H 1*/ /*#define HAVE_ROAPI_H 1*/ /*#define HAVE_SHELLSCALINGAPI_H 1*/ #define HAVE_MMDEVICEAPI_H 1 @@ -62,7 +61,6 @@ #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 #define HAVE_STDARG_H 1 -#define HAVE_STDBOOL_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -72,10 +70,7 @@ /* C library functions */ #define HAVE_LIBC 1 -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -84,9 +79,6 @@ #define HAVE_STRLEN 1 #define HAVE_STRPBRK 1 #define HAVE__STRREV 1 -/* These functions have security warnings, so we won't use them */ -/* #undef HAVE__STRUPR */ -/* #undef HAVE__STRLWR */ #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 @@ -100,8 +92,7 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE__WCSDUP 1 +#define HAVE_STRNCMP 1 #define HAVE_ACOS 1 #define HAVE_ASIN 1 #define HAVE_ATAN 1 @@ -160,7 +151,6 @@ #define SDL_AUDIO_DRIVER_WASAPI 1 #endif /*#define SDL_AUDIO_DRIVER_DSOUND 1*/ -/*#define SDL_AUDIO_DRIVER_WINMM 1*/ #define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DUMMY 1 @@ -216,7 +206,6 @@ /* Enable filesystem support */ /* #define SDL_FILESYSTEM_WINDOWS 1*/ -#define SDL_FILESYSTEM_XBOX 1 #define SDL_FSOPS_WINDOWS 1 From 1b97d65d630c1a0d9c6cd4ce91fa251b7426d507 Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 12:41:28 +0100 Subject: [PATCH 02/10] build_config: remove unused `SIZEOF_VOIDP` --- include/build_config/SDL_build_config.h.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index 5de195b4d6427..06643219cea41 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -31,14 +31,6 @@ /* General platform specific identifiers */ #include -/* C datatypes */ -/* Define SIZEOF_VOIDP for 64/32 architectures */ -#if defined(__LP64__) || defined(_LP64) || defined(_WIN64) -#define SIZEOF_VOIDP 8 -#else -#define SIZEOF_VOIDP 4 -#endif - #cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@ #cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@ From a810eec53b0439fd7b6a0741342893dfd7e21a7d Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 12:44:42 +0100 Subject: [PATCH 03/10] build_config: move unconditionally defined macros --- include/build_config/SDL_build_config.h.cmake | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index 06643219cea41..84609b547e441 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -36,13 +36,18 @@ #cmakedefine SDL_DISABLE_ALLOCA +/* Useful headers */ +#cmakedefine HAVE_FLOAT_H 1 +#cmakedefine HAVE_STDARG_H 1 +#cmakedefine HAVE_STDDEF_H 1 +#cmakedefine HAVE_STDINT_H 1 + /* Comment this if you want to build without any C library requirements */ #cmakedefine HAVE_LIBC 1 #ifdef HAVE_LIBC /* Useful headers */ #cmakedefine HAVE_ALLOCA_H 1 -#cmakedefine HAVE_FLOAT_H 1 #cmakedefine HAVE_ICONV_H 1 #cmakedefine HAVE_INTTYPES_H 1 #cmakedefine HAVE_LIMITS_H 1 @@ -50,9 +55,6 @@ #cmakedefine HAVE_MATH_H 1 #cmakedefine HAVE_MEMORY_H 1 #cmakedefine HAVE_SIGNAL_H 1 -#cmakedefine HAVE_STDARG_H 1 -#cmakedefine HAVE_STDDEF_H 1 -#cmakedefine HAVE_STDINT_H 1 #cmakedefine HAVE_STDIO_H 1 #cmakedefine HAVE_STDLIB_H 1 #cmakedefine HAVE_STRINGS_H 1 @@ -191,11 +193,6 @@ #cmakedefine HAVE_POLL 1 #cmakedefine HAVE__EXIT 1 -#else -#cmakedefine HAVE_STDARG_H 1 -#cmakedefine HAVE_STDDEF_H 1 -#cmakedefine HAVE_STDINT_H 1 -#cmakedefine HAVE_FLOAT_H 1 #endif /* HAVE_LIBC */ #cmakedefine HAVE_DBUS_DBUS_H 1 From 5b1551756aa0003ec53c09970556a09337b69c6b Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 13:08:07 +0100 Subject: [PATCH 04/10] build_config: add missing macros Those are defined in other build_configs files and used elsewhere in SDL. --- include/build_config/SDL_build_config.h.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index 84609b547e441..dbe67920f887d 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -50,6 +50,7 @@ #cmakedefine HAVE_ALLOCA_H 1 #cmakedefine HAVE_ICONV_H 1 #cmakedefine HAVE_INTTYPES_H 1 +#cmakedefine HAVE_LIBUNWIND_H 1 #cmakedefine HAVE_LIMITS_H 1 #cmakedefine HAVE_MALLOC_H 1 #cmakedefine HAVE_MATH_H 1 @@ -128,6 +129,7 @@ #cmakedefine HAVE_CEILF 1 #cmakedefine HAVE_COPYSIGN 1 #cmakedefine HAVE_COPYSIGNF 1 +#cmakedefine HAVE__COPYSIGN 1 #cmakedefine HAVE_COS 1 #cmakedefine HAVE_COSF 1 #cmakedefine HAVE_EXP 1 @@ -166,6 +168,7 @@ #cmakedefine HAVE_TANF 1 #cmakedefine HAVE_TRUNC 1 #cmakedefine HAVE_TRUNCF 1 +#cmakedefine HAVE__FSEEKI64 1 #cmakedefine HAVE_FOPEN64 1 #cmakedefine HAVE_FSEEKO 1 #cmakedefine HAVE_FSEEKO64 1 @@ -488,6 +491,8 @@ /* Enable ime support */ #cmakedefine SDL_USE_IME @SDL_USE_IME@ +#cmakedefine SDL_DISABLE_WINDOWS_IME 1 +#cmakedefine SDL_GDK_TEXTINPUT 1 /* Platform specific definitions */ #cmakedefine SDL_IPHONE_KEYBOARD @SDL_IPHONE_KEYBOARD@ From ba3193bb73b06c842d2ce169b45907537c415f1f Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 13:18:43 +0100 Subject: [PATCH 05/10] build_config: fix `SDL_DEFAULT_ASSERT_LEVEL` Currently, `SDL_DEFAULT_ASSERT_LEVEL` is commented out by CMake when its value is 0, setting the assertions level to the default value instead of disabling them. This change: - defines `SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED` when its value is non-zero. - defines `SDL_DEFAULT_ASSERT_LEVEL`, regardless of its value, when `SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED` is defined. --- include/build_config/SDL_build_config.h.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index dbe67920f887d..71bc691322e1d 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -227,8 +227,9 @@ #cmakedefine USE_POSIX_SPAWN @USE_POSIX_SPAWN@ /* SDL internal assertion support */ -#if @SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED@ -#cmakedefine SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@ +#cmakedefine SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED 1 +#ifdef SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED +#define SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@ #endif /* Allow disabling of major subsystems */ From 8e6caf8a1a0812deae6d85b89a5be9be4aa123ec Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 16:45:13 +0100 Subject: [PATCH 06/10] SDL_camera_pipewire: use `SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC` --- src/camera/pipewire/SDL_camera_pipewire.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/camera/pipewire/SDL_camera_pipewire.c b/src/camera/pipewire/SDL_camera_pipewire.c index 8460d995e79e8..f5cdad95b724b 100644 --- a/src/camera/pipewire/SDL_camera_pipewire.c +++ b/src/camera/pipewire/SDL_camera_pipewire.c @@ -98,9 +98,9 @@ static struct pw_properties *(*PIPEWIRE_pw_properties_new_dict)(const struct spa static int (*PIPEWIRE_pw_properties_set)(struct pw_properties *, const char *, const char *); static int (*PIPEWIRE_pw_properties_setf)(struct pw_properties *, const char *, const char *, ...) SPA_PRINTF_FUNC(3, 4); -#ifdef SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC +#ifdef SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC -static const char *pipewire_library = SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC; +static const char *pipewire_library = SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC; static SDL_SharedObject *pipewire_handle = NULL; static bool pipewire_dlsym(const char *fn, void **addr) @@ -146,7 +146,7 @@ static void unload_pipewire_library(void) // Nothing to do } -#endif // SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC +#endif // SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC static bool load_pipewire_syms(void) { From 330b212dbe08d644a8636b55af3cb82cc6fd386d Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 16:47:44 +0100 Subject: [PATCH 07/10] Fix various `#if defined`s --- src/joystick/bsd/SDL_bsdjoystick.c | 2 +- src/joystick/windows/SDL_windowsjoystick.c | 2 +- src/timer/SDL_timer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/joystick/bsd/SDL_bsdjoystick.c b/src/joystick/bsd/SDL_bsdjoystick.c index 4b34116c31eae..5337620714b92 100644 --- a/src/joystick/bsd/SDL_bsdjoystick.c +++ b/src/joystick/bsd/SDL_bsdjoystick.c @@ -77,7 +77,7 @@ #include "../SDL_joystick_c.h" #include "../hidapi/SDL_hidapijoystick_c.h" -#if defined(SDL_PLATFORM_FREEBSD) || SDL_HAVE_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__) || defined(__DragonFly_) +#if defined(SDL_PLATFORM_FREEBSD) || defined(SDL_HAVE_MACHINE_JOYSTICK_H) || defined(__FreeBSD_kernel__) || defined(__DragonFly_) #define SUPPORT_JOY_GAMEPORT #endif diff --git a/src/joystick/windows/SDL_windowsjoystick.c b/src/joystick/windows/SDL_windowsjoystick.c index b01d7a038bc3c..20ba28b014e7f 100644 --- a/src/joystick/windows/SDL_windowsjoystick.c +++ b/src/joystick/windows/SDL_windowsjoystick.c @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if defined(SDL_JOYSTICK_DINPUT) || SDL_JOYSTICK_XINPUT +#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT) /* DirectInput joystick driver; written by Glenn Maynard, based on Andrei de * A. Formiga's WINMM driver. diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c index b47117e523de4..c2dc095481653 100644 --- a/src/timer/SDL_timer.c +++ b/src/timer/SDL_timer.c @@ -533,7 +533,7 @@ bool SDL_RemoveTimer(SDL_TimerID id) } } -#endif // !defined(SDL_PLATFORM_EMSCRIPTEN) || !SDL_THREADS_DISABLED +#endif // !SDL_PLATFORM_EMSCRIPTEN || !SDL_THREADS_DISABLED static Uint64 tick_start; static Uint32 tick_numerator_ns; From 219d0b656f4d81ded7f18cabc9c0bd92209892ca Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 17:22:48 +0100 Subject: [PATCH 08/10] build_config: change unnecessary replacement variables to 1 Makes all macros only used in `#ifdef`s defined as `1` when they exist, instead of the CMake value of the corresponding variable. --- include/build_config/SDL_build_config.h.cmake | 426 +++++++++--------- 1 file changed, 213 insertions(+), 213 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index 71bc691322e1d..d03a88f67edef 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -31,10 +31,10 @@ /* General platform specific identifiers */ #include -#cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@ -#cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@ +#cmakedefine HAVE_GCC_ATOMICS 1 +#cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1 -#cmakedefine SDL_DISABLE_ALLOCA +#cmakedefine SDL_DISABLE_ALLOCA 1 /* Useful headers */ #cmakedefine HAVE_FLOAT_H 1 @@ -210,21 +210,21 @@ #cmakedefine HAVE_LIBUDEV_H 1 #cmakedefine HAVE_LIBDECOR_H 1 -#cmakedefine HAVE_DDRAW_H @HAVE_DDRAW_H@ -#cmakedefine HAVE_DSOUND_H @HAVE_DSOUND_H@ -#cmakedefine HAVE_DINPUT_H @HAVE_DINPUT_H@ -#cmakedefine HAVE_XINPUT_H @HAVE_XINPUT_H@ -#cmakedefine HAVE_WINDOWS_GAMING_INPUT_H @HAVE_WINDOWS_GAMING_INPUT_H@ -#cmakedefine HAVE_GAMEINPUT_H @HAVE_GAMEINPUT_H@ -#cmakedefine HAVE_DXGI_H @HAVE_DXGI_H@ -#cmakedefine HAVE_DXGI1_6_H @HAVE_DXGI1_6_H@ +#cmakedefine HAVE_DDRAW_H 1 +#cmakedefine HAVE_DSOUND_H 1 +#cmakedefine HAVE_DINPUT_H 1 +#cmakedefine HAVE_XINPUT_H 1 +#cmakedefine HAVE_WINDOWS_GAMING_INPUT_H 1 +#cmakedefine HAVE_GAMEINPUT_H 1 +#cmakedefine HAVE_DXGI_H 1 +#cmakedefine HAVE_DXGI1_6_H 1 -#cmakedefine HAVE_MMDEVICEAPI_H @HAVE_MMDEVICEAPI_H@ -#cmakedefine HAVE_TPCSHRD_H @HAVE_TPCSHRD_H@ -#cmakedefine HAVE_ROAPI_H @HAVE_ROAPI_H@ -#cmakedefine HAVE_SHELLSCALINGAPI_H @HAVE_SHELLSCALINGAPI_H@ +#cmakedefine HAVE_MMDEVICEAPI_H 1 +#cmakedefine HAVE_TPCSHRD_H 1 +#cmakedefine HAVE_ROAPI_H 1 +#cmakedefine HAVE_SHELLSCALINGAPI_H 1 -#cmakedefine USE_POSIX_SPAWN @USE_POSIX_SPAWN@ +#cmakedefine USE_POSIX_SPAWN 1 /* SDL internal assertion support */ #cmakedefine SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED 1 @@ -233,155 +233,155 @@ #endif /* Allow disabling of major subsystems */ -#cmakedefine SDL_AUDIO_DISABLED @SDL_AUDIO_DISABLED@ -#cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@ -#cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@ -#cmakedefine SDL_HIDAPI_DISABLED @SDL_HIDAPI_DISABLED@ -#cmakedefine SDL_SENSOR_DISABLED @SDL_SENSOR_DISABLED@ -#cmakedefine SDL_RENDER_DISABLED @SDL_RENDER_DISABLED@ -#cmakedefine SDL_THREADS_DISABLED @SDL_THREADS_DISABLED@ -#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@ -#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@ -#cmakedefine SDL_CAMERA_DISABLED @SDL_CAMERA_DISABLED@ -#cmakedefine SDL_GPU_DISABLED @SDL_GPU_DISABLED@ +#cmakedefine SDL_AUDIO_DISABLED 1 +#cmakedefine SDL_JOYSTICK_DISABLED 1 +#cmakedefine SDL_HAPTIC_DISABLED 1 +#cmakedefine SDL_HIDAPI_DISABLED 1 +#cmakedefine SDL_SENSOR_DISABLED 1 +#cmakedefine SDL_RENDER_DISABLED 1 +#cmakedefine SDL_THREADS_DISABLED 1 +#cmakedefine SDL_VIDEO_DISABLED 1 +#cmakedefine SDL_POWER_DISABLED 1 +#cmakedefine SDL_CAMERA_DISABLED 1 +#cmakedefine SDL_GPU_DISABLED 1 /* Enable various audio drivers */ -#cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@ +#cmakedefine SDL_AUDIO_DRIVER_ALSA 1 #cmakedefine SDL_AUDIO_DRIVER_ALSA_DYNAMIC @SDL_AUDIO_DRIVER_ALSA_DYNAMIC@ -#cmakedefine SDL_AUDIO_DRIVER_OPENSLES @SDL_AUDIO_DRIVER_OPENSLES@ -#cmakedefine SDL_AUDIO_DRIVER_AAUDIO @SDL_AUDIO_DRIVER_AAUDIO@ -#cmakedefine SDL_AUDIO_DRIVER_COREAUDIO @SDL_AUDIO_DRIVER_COREAUDIO@ -#cmakedefine SDL_AUDIO_DRIVER_DISK @SDL_AUDIO_DRIVER_DISK@ -#cmakedefine SDL_AUDIO_DRIVER_DSOUND @SDL_AUDIO_DRIVER_DSOUND@ -#cmakedefine SDL_AUDIO_DRIVER_DUMMY @SDL_AUDIO_DRIVER_DUMMY@ -#cmakedefine SDL_AUDIO_DRIVER_EMSCRIPTEN @SDL_AUDIO_DRIVER_EMSCRIPTEN@ -#cmakedefine SDL_AUDIO_DRIVER_HAIKU @SDL_AUDIO_DRIVER_HAIKU@ -#cmakedefine SDL_AUDIO_DRIVER_JACK @SDL_AUDIO_DRIVER_JACK@ +#cmakedefine SDL_AUDIO_DRIVER_OPENSLES 1 +#cmakedefine SDL_AUDIO_DRIVER_AAUDIO 1 +#cmakedefine SDL_AUDIO_DRIVER_COREAUDIO 1 +#cmakedefine SDL_AUDIO_DRIVER_DISK 1 +#cmakedefine SDL_AUDIO_DRIVER_DSOUND 1 +#cmakedefine SDL_AUDIO_DRIVER_DUMMY 1 +#cmakedefine SDL_AUDIO_DRIVER_EMSCRIPTEN 1 +#cmakedefine SDL_AUDIO_DRIVER_HAIKU 1 +#cmakedefine SDL_AUDIO_DRIVER_JACK 1 #cmakedefine SDL_AUDIO_DRIVER_JACK_DYNAMIC @SDL_AUDIO_DRIVER_JACK_DYNAMIC@ -#cmakedefine SDL_AUDIO_DRIVER_NETBSD @SDL_AUDIO_DRIVER_NETBSD@ -#cmakedefine SDL_AUDIO_DRIVER_OSS @SDL_AUDIO_DRIVER_OSS@ -#cmakedefine SDL_AUDIO_DRIVER_PIPEWIRE @SDL_AUDIO_DRIVER_PIPEWIRE@ +#cmakedefine SDL_AUDIO_DRIVER_NETBSD 1 +#cmakedefine SDL_AUDIO_DRIVER_OSS 1 +#cmakedefine SDL_AUDIO_DRIVER_PIPEWIRE 1 #cmakedefine SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC @SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC@ -#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@ +#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO 1 #cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@ -#cmakedefine SDL_AUDIO_DRIVER_SNDIO @SDL_AUDIO_DRIVER_SNDIO@ +#cmakedefine SDL_AUDIO_DRIVER_SNDIO 1 #cmakedefine SDL_AUDIO_DRIVER_SNDIO_DYNAMIC @SDL_AUDIO_DRIVER_SNDIO_DYNAMIC@ -#cmakedefine SDL_AUDIO_DRIVER_WASAPI @SDL_AUDIO_DRIVER_WASAPI@ -#cmakedefine SDL_AUDIO_DRIVER_VITA @SDL_AUDIO_DRIVER_VITA@ -#cmakedefine SDL_AUDIO_DRIVER_PSP @SDL_AUDIO_DRIVER_PSP@ -#cmakedefine SDL_AUDIO_DRIVER_PS2 @SDL_AUDIO_DRIVER_PS2@ -#cmakedefine SDL_AUDIO_DRIVER_N3DS @SDL_AUDIO_DRIVER_N3DS@ -#cmakedefine SDL_AUDIO_DRIVER_QNX @SDL_AUDIO_DRIVER_QNX@ +#cmakedefine SDL_AUDIO_DRIVER_WASAPI 1 +#cmakedefine SDL_AUDIO_DRIVER_VITA 1 +#cmakedefine SDL_AUDIO_DRIVER_PSP 1 +#cmakedefine SDL_AUDIO_DRIVER_PS2 1 +#cmakedefine SDL_AUDIO_DRIVER_N3DS 1 +#cmakedefine SDL_AUDIO_DRIVER_QNX 1 /* Enable various input drivers */ -#cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@ -#cmakedefine SDL_INPUT_LINUXKD @SDL_INPUT_LINUXKD@ -#cmakedefine SDL_INPUT_FBSDKBIO @SDL_INPUT_FBSDKBIO@ -#cmakedefine SDL_INPUT_WSCONS @SDL_INPUT_WSCONS@ -#cmakedefine SDL_HAVE_MACHINE_JOYSTICK_H @SDL_HAVE_MACHINE_JOYSTICK_H@ -#cmakedefine SDL_JOYSTICK_ANDROID @SDL_JOYSTICK_ANDROID@ -#cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@ -#cmakedefine SDL_JOYSTICK_DUMMY @SDL_JOYSTICK_DUMMY@ -#cmakedefine SDL_JOYSTICK_EMSCRIPTEN @SDL_JOYSTICK_EMSCRIPTEN@ -#cmakedefine SDL_JOYSTICK_GAMEINPUT @SDL_JOYSTICK_GAMEINPUT@ -#cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@ -#cmakedefine SDL_JOYSTICK_HIDAPI @SDL_JOYSTICK_HIDAPI@ -#cmakedefine SDL_JOYSTICK_IOKIT @SDL_JOYSTICK_IOKIT@ -#cmakedefine SDL_JOYSTICK_LINUX @SDL_JOYSTICK_LINUX@ -#cmakedefine SDL_JOYSTICK_MFI @SDL_JOYSTICK_MFI@ -#cmakedefine SDL_JOYSTICK_N3DS @SDL_JOYSTICK_N3DS@ -#cmakedefine SDL_JOYSTICK_PS2 @SDL_JOYSTICK_PS2@ -#cmakedefine SDL_JOYSTICK_PSP @SDL_JOYSTICK_PSP@ -#cmakedefine SDL_JOYSTICK_RAWINPUT @SDL_JOYSTICK_RAWINPUT@ -#cmakedefine SDL_JOYSTICK_USBHID @SDL_JOYSTICK_USBHID@ -#cmakedefine SDL_JOYSTICK_VIRTUAL @SDL_JOYSTICK_VIRTUAL@ -#cmakedefine SDL_JOYSTICK_VITA @SDL_JOYSTICK_VITA@ -#cmakedefine SDL_JOYSTICK_WGI @SDL_JOYSTICK_WGI@ -#cmakedefine SDL_JOYSTICK_XINPUT @SDL_JOYSTICK_XINPUT@ -#cmakedefine SDL_HAPTIC_DUMMY @SDL_HAPTIC_DUMMY@ -#cmakedefine SDL_HAPTIC_LINUX @SDL_HAPTIC_LINUX@ -#cmakedefine SDL_HAPTIC_IOKIT @SDL_HAPTIC_IOKIT@ -#cmakedefine SDL_HAPTIC_DINPUT @SDL_HAPTIC_DINPUT@ -#cmakedefine SDL_HAPTIC_ANDROID @SDL_HAPTIC_ANDROID@ +#cmakedefine SDL_INPUT_LINUXEV 1 +#cmakedefine SDL_INPUT_LINUXKD 1 +#cmakedefine SDL_INPUT_FBSDKBIO 1 +#cmakedefine SDL_INPUT_WSCONS 1 +#cmakedefine SDL_HAVE_MACHINE_JOYSTICK_H 1 +#cmakedefine SDL_JOYSTICK_ANDROID 1 +#cmakedefine SDL_JOYSTICK_DINPUT 1 +#cmakedefine SDL_JOYSTICK_DUMMY 1 +#cmakedefine SDL_JOYSTICK_EMSCRIPTEN 1 +#cmakedefine SDL_JOYSTICK_GAMEINPUT 1 +#cmakedefine SDL_JOYSTICK_HAIKU 1 +#cmakedefine SDL_JOYSTICK_HIDAPI 1 +#cmakedefine SDL_JOYSTICK_IOKIT 1 +#cmakedefine SDL_JOYSTICK_LINUX 1 +#cmakedefine SDL_JOYSTICK_MFI 1 +#cmakedefine SDL_JOYSTICK_N3DS 1 +#cmakedefine SDL_JOYSTICK_PS2 1 +#cmakedefine SDL_JOYSTICK_PSP 1 +#cmakedefine SDL_JOYSTICK_RAWINPUT 1 +#cmakedefine SDL_JOYSTICK_USBHID 1 +#cmakedefine SDL_JOYSTICK_VIRTUAL 1 +#cmakedefine SDL_JOYSTICK_VITA 1 +#cmakedefine SDL_JOYSTICK_WGI 1 +#cmakedefine SDL_JOYSTICK_XINPUT 1 +#cmakedefine SDL_HAPTIC_DUMMY 1 +#cmakedefine SDL_HAPTIC_LINUX 1 +#cmakedefine SDL_HAPTIC_IOKIT 1 +#cmakedefine SDL_HAPTIC_DINPUT 1 +#cmakedefine SDL_HAPTIC_ANDROID 1 #cmakedefine SDL_LIBUSB_DYNAMIC @SDL_LIBUSB_DYNAMIC@ #cmakedefine SDL_UDEV_DYNAMIC @SDL_UDEV_DYNAMIC@ /* Enable various process implementations */ -#cmakedefine SDL_PROCESS_DUMMY @SDL_PROCESS_DUMMY@ -#cmakedefine SDL_PROCESS_POSIX @SDL_PROCESS_POSIX@ -#cmakedefine SDL_PROCESS_WINDOWS @SDL_PROCESS_WINDOWS@ +#cmakedefine SDL_PROCESS_DUMMY 1 +#cmakedefine SDL_PROCESS_POSIX 1 +#cmakedefine SDL_PROCESS_WINDOWS 1 /* Enable various sensor drivers */ -#cmakedefine SDL_SENSOR_ANDROID @SDL_SENSOR_ANDROID@ -#cmakedefine SDL_SENSOR_COREMOTION @SDL_SENSOR_COREMOTION@ -#cmakedefine SDL_SENSOR_WINDOWS @SDL_SENSOR_WINDOWS@ -#cmakedefine SDL_SENSOR_DUMMY @SDL_SENSOR_DUMMY@ -#cmakedefine SDL_SENSOR_VITA @SDL_SENSOR_VITA@ -#cmakedefine SDL_SENSOR_N3DS @SDL_SENSOR_N3DS@ +#cmakedefine SDL_SENSOR_ANDROID 1 +#cmakedefine SDL_SENSOR_COREMOTION 1 +#cmakedefine SDL_SENSOR_WINDOWS 1 +#cmakedefine SDL_SENSOR_DUMMY 1 +#cmakedefine SDL_SENSOR_VITA 1 +#cmakedefine SDL_SENSOR_N3DS 1 /* Enable various shared object loading systems */ -#cmakedefine SDL_LOADSO_DLOPEN @SDL_LOADSO_DLOPEN@ -#cmakedefine SDL_LOADSO_DUMMY @SDL_LOADSO_DUMMY@ -#cmakedefine SDL_LOADSO_WINDOWS @SDL_LOADSO_WINDOWS@ +#cmakedefine SDL_LOADSO_DLOPEN 1 +#cmakedefine SDL_LOADSO_DUMMY 1 +#cmakedefine SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ -#cmakedefine SDL_THREAD_GENERIC_COND_SUFFIX @SDL_THREAD_GENERIC_COND_SUFFIX@ -#cmakedefine SDL_THREAD_GENERIC_RWLOCK_SUFFIX @SDL_THREAD_GENERIC_RWLOCK_SUFFIX@ -#cmakedefine SDL_THREAD_PTHREAD @SDL_THREAD_PTHREAD@ -#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX@ -#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP@ -#cmakedefine SDL_THREAD_WINDOWS @SDL_THREAD_WINDOWS@ -#cmakedefine SDL_THREAD_VITA @SDL_THREAD_VITA@ -#cmakedefine SDL_THREAD_PSP @SDL_THREAD_PSP@ -#cmakedefine SDL_THREAD_PS2 @SDL_THREAD_PS2@ -#cmakedefine SDL_THREAD_N3DS @SDL_THREAD_N3DS@ +#cmakedefine SDL_THREAD_GENERIC_COND_SUFFIX 1 +#cmakedefine SDL_THREAD_GENERIC_RWLOCK_SUFFIX 1 +#cmakedefine SDL_THREAD_PTHREAD 1 +#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1 +#cmakedefine SDL_THREAD_WINDOWS 1 +#cmakedefine SDL_THREAD_VITA 1 +#cmakedefine SDL_THREAD_PSP 1 +#cmakedefine SDL_THREAD_PS2 1 +#cmakedefine SDL_THREAD_N3DS 1 /* Enable various RTC systems */ -#cmakedefine SDL_TIME_UNIX @SDL_TIME_UNIX@ -#cmakedefine SDL_TIME_WINDOWS @SDL_TIME_WINDOWS@ -#cmakedefine SDL_TIME_VITA @SDL_TIME_VITA@ -#cmakedefine SDL_TIME_PSP @SDL_TIME_PSP@ -#cmakedefine SDL_TIME_PS2 @SDL_TIME_PS2@ -#cmakedefine SDL_TIME_N3DS @SDL_TIME_N3DS@ +#cmakedefine SDL_TIME_UNIX 1 +#cmakedefine SDL_TIME_WINDOWS 1 +#cmakedefine SDL_TIME_VITA 1 +#cmakedefine SDL_TIME_PSP 1 +#cmakedefine SDL_TIME_PS2 1 +#cmakedefine SDL_TIME_N3DS 1 /* Enable various timer systems */ -#cmakedefine SDL_TIMER_HAIKU @SDL_TIMER_HAIKU@ -#cmakedefine SDL_TIMER_UNIX @SDL_TIMER_UNIX@ -#cmakedefine SDL_TIMER_WINDOWS @SDL_TIMER_WINDOWS@ -#cmakedefine SDL_TIMER_VITA @SDL_TIMER_VITA@ -#cmakedefine SDL_TIMER_PSP @SDL_TIMER_PSP@ -#cmakedefine SDL_TIMER_PS2 @SDL_TIMER_PS2@ -#cmakedefine SDL_TIMER_N3DS @SDL_TIMER_N3DS@ +#cmakedefine SDL_TIMER_HAIKU 1 +#cmakedefine SDL_TIMER_UNIX 1 +#cmakedefine SDL_TIMER_WINDOWS 1 +#cmakedefine SDL_TIMER_VITA 1 +#cmakedefine SDL_TIMER_PSP 1 +#cmakedefine SDL_TIMER_PS2 1 +#cmakedefine SDL_TIMER_N3DS 1 /* Enable various video drivers */ -#cmakedefine SDL_VIDEO_DRIVER_ANDROID @SDL_VIDEO_DRIVER_ANDROID@ -#cmakedefine SDL_VIDEO_DRIVER_COCOA @SDL_VIDEO_DRIVER_COCOA@ -#cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@ -#cmakedefine SDL_VIDEO_DRIVER_EMSCRIPTEN @SDL_VIDEO_DRIVER_EMSCRIPTEN@ -#cmakedefine SDL_VIDEO_DRIVER_HAIKU @SDL_VIDEO_DRIVER_HAIKU@ -#cmakedefine SDL_VIDEO_DRIVER_KMSDRM @SDL_VIDEO_DRIVER_KMSDRM@ +#cmakedefine SDL_VIDEO_DRIVER_ANDROID 1 +#cmakedefine SDL_VIDEO_DRIVER_COCOA 1 +#cmakedefine SDL_VIDEO_DRIVER_DUMMY 1 +#cmakedefine SDL_VIDEO_DRIVER_EMSCRIPTEN 1 +#cmakedefine SDL_VIDEO_DRIVER_HAIKU 1 +#cmakedefine SDL_VIDEO_DRIVER_KMSDRM 1 #cmakedefine SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC @SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC@ #cmakedefine SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM @SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM@ -#cmakedefine SDL_VIDEO_DRIVER_N3DS @SDL_VIDEO_DRIVER_N3DS@ -#cmakedefine SDL_VIDEO_DRIVER_OFFSCREEN @SDL_VIDEO_DRIVER_OFFSCREEN@ -#cmakedefine SDL_VIDEO_DRIVER_PS2 @SDL_VIDEO_DRIVER_PS2@ -#cmakedefine SDL_VIDEO_DRIVER_PSP @SDL_VIDEO_DRIVER_PSP@ -#cmakedefine SDL_VIDEO_DRIVER_RISCOS @SDL_VIDEO_DRIVER_RISCOS@ -#cmakedefine SDL_VIDEO_DRIVER_ROCKCHIP @SDL_VIDEO_DRIVER_ROCKCHIP@ -#cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@ -#cmakedefine SDL_VIDEO_DRIVER_UIKIT @SDL_VIDEO_DRIVER_UIKIT@ -#cmakedefine SDL_VIDEO_DRIVER_VITA @SDL_VIDEO_DRIVER_VITA@ -#cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@ -#cmakedefine SDL_VIDEO_DRIVER_VIVANTE_VDK @SDL_VIDEO_DRIVER_VIVANTE_VDK@ -#cmakedefine SDL_VIDEO_DRIVER_OPENVR @SDL_VIDEO_DRIVER_OPENVR@ -#cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@ +#cmakedefine SDL_VIDEO_DRIVER_N3DS 1 +#cmakedefine SDL_VIDEO_DRIVER_OFFSCREEN 1 +#cmakedefine SDL_VIDEO_DRIVER_PS2 1 +#cmakedefine SDL_VIDEO_DRIVER_PSP 1 +#cmakedefine SDL_VIDEO_DRIVER_RISCOS 1 +#cmakedefine SDL_VIDEO_DRIVER_ROCKCHIP 1 +#cmakedefine SDL_VIDEO_DRIVER_RPI 1 +#cmakedefine SDL_VIDEO_DRIVER_UIKIT 1 +#cmakedefine SDL_VIDEO_DRIVER_VITA 1 +#cmakedefine SDL_VIDEO_DRIVER_VIVANTE 1 +#cmakedefine SDL_VIDEO_DRIVER_VIVANTE_VDK 1 +#cmakedefine SDL_VIDEO_DRIVER_OPENVR 1 +#cmakedefine SDL_VIDEO_DRIVER_WAYLAND 1 #cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC@ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR@ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL@ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR@ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON@ -#cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@ -#cmakedefine SDL_VIDEO_DRIVER_X11 @SDL_VIDEO_DRIVER_X11@ +#cmakedefine SDL_VIDEO_DRIVER_WINDOWS 1 +#cmakedefine SDL_VIDEO_DRIVER_X11 1 #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC @SDL_VIDEO_DRIVER_X11_DYNAMIC@ #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR@ #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT @SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT@ @@ -389,119 +389,119 @@ #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 @SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2@ #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR@ #cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS @SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS@ -#cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBLOOKUPKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBLOOKUPKEYSYM@ -#cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XCURSOR @SDL_VIDEO_DRIVER_X11_XCURSOR@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XDBE @SDL_VIDEO_DRIVER_X11_XDBE@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XFIXES @SDL_VIDEO_DRIVER_X11_XFIXES@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2 @SDL_VIDEO_DRIVER_X11_XINPUT2@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH @SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XRANDR @SDL_VIDEO_DRIVER_X11_XRANDR@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XSCRNSAVER @SDL_VIDEO_DRIVER_X11_XSCRNSAVER@ -#cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@ -#cmakedefine SDL_VIDEO_DRIVER_QNX @SDL_VIDEO_DRIVER_QNX@ - -#cmakedefine SDL_VIDEO_RENDER_D3D @SDL_VIDEO_RENDER_D3D@ -#cmakedefine SDL_VIDEO_RENDER_D3D11 @SDL_VIDEO_RENDER_D3D11@ -#cmakedefine SDL_VIDEO_RENDER_D3D12 @SDL_VIDEO_RENDER_D3D12@ -#cmakedefine SDL_VIDEO_RENDER_GPU @SDL_VIDEO_RENDER_GPU@ -#cmakedefine SDL_VIDEO_RENDER_METAL @SDL_VIDEO_RENDER_METAL@ -#cmakedefine SDL_VIDEO_RENDER_VULKAN @SDL_VIDEO_RENDER_VULKAN@ -#cmakedefine SDL_VIDEO_RENDER_OGL @SDL_VIDEO_RENDER_OGL@ -#cmakedefine SDL_VIDEO_RENDER_OGL_ES2 @SDL_VIDEO_RENDER_OGL_ES2@ -#cmakedefine SDL_VIDEO_RENDER_PS2 @SDL_VIDEO_RENDER_PS2@ -#cmakedefine SDL_VIDEO_RENDER_PSP @SDL_VIDEO_RENDER_PSP@ -#cmakedefine SDL_VIDEO_RENDER_VITA_GXM @SDL_VIDEO_RENDER_VITA_GXM@ +#cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBLOOKUPKEYSYM 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XCURSOR 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XDBE 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XFIXES 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XRANDR 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 +#cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE 1 +#cmakedefine SDL_VIDEO_DRIVER_QNX 1 + +#cmakedefine SDL_VIDEO_RENDER_D3D 1 +#cmakedefine SDL_VIDEO_RENDER_D3D11 1 +#cmakedefine SDL_VIDEO_RENDER_D3D12 1 +#cmakedefine SDL_VIDEO_RENDER_GPU 1 +#cmakedefine SDL_VIDEO_RENDER_METAL 1 +#cmakedefine SDL_VIDEO_RENDER_VULKAN 1 +#cmakedefine SDL_VIDEO_RENDER_OGL 1 +#cmakedefine SDL_VIDEO_RENDER_OGL_ES2 1 +#cmakedefine SDL_VIDEO_RENDER_PS2 1 +#cmakedefine SDL_VIDEO_RENDER_PSP 1 +#cmakedefine SDL_VIDEO_RENDER_VITA_GXM 1 /* Enable OpenGL support */ -#cmakedefine SDL_VIDEO_OPENGL @SDL_VIDEO_OPENGL@ -#cmakedefine SDL_VIDEO_OPENGL_ES @SDL_VIDEO_OPENGL_ES@ -#cmakedefine SDL_VIDEO_OPENGL_ES2 @SDL_VIDEO_OPENGL_ES2@ -#cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@ -#cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@ -#cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@ -#cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@ +#cmakedefine SDL_VIDEO_OPENGL 1 +#cmakedefine SDL_VIDEO_OPENGL_ES 1 +#cmakedefine SDL_VIDEO_OPENGL_ES2 1 +#cmakedefine SDL_VIDEO_OPENGL_CGL 1 +#cmakedefine SDL_VIDEO_OPENGL_GLX 1 +#cmakedefine SDL_VIDEO_OPENGL_WGL 1 +#cmakedefine SDL_VIDEO_OPENGL_EGL 1 /* Enable Vulkan support */ -#cmakedefine SDL_VIDEO_VULKAN @SDL_VIDEO_VULKAN@ +#cmakedefine SDL_VIDEO_VULKAN 1 /* Enable Metal support */ -#cmakedefine SDL_VIDEO_METAL @SDL_VIDEO_METAL@ +#cmakedefine SDL_VIDEO_METAL 1 /* Enable GPU support */ -#cmakedefine SDL_GPU_D3D11 @SDL_GPU_D3D11@ -#cmakedefine SDL_GPU_D3D12 @SDL_GPU_D3D12@ -#cmakedefine SDL_GPU_VULKAN @SDL_GPU_VULKAN@ -#cmakedefine SDL_GPU_METAL @SDL_GPU_METAL@ +#cmakedefine SDL_GPU_D3D11 1 +#cmakedefine SDL_GPU_D3D12 1 +#cmakedefine SDL_GPU_VULKAN 1 +#cmakedefine SDL_GPU_METAL 1 /* Enable system power support */ -#cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@ -#cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@ -#cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@ -#cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@ -#cmakedefine SDL_POWER_UIKIT @SDL_POWER_UIKIT@ -#cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@ -#cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@ -#cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@ -#cmakedefine SDL_POWER_VITA @SDL_POWER_VITA@ -#cmakedefine SDL_POWER_PSP @SDL_POWER_PSP@ -#cmakedefine SDL_POWER_N3DS @SDL_POWER_N3DS@ +#cmakedefine SDL_POWER_ANDROID 1 +#cmakedefine SDL_POWER_LINUX 1 +#cmakedefine SDL_POWER_WINDOWS 1 +#cmakedefine SDL_POWER_MACOSX 1 +#cmakedefine SDL_POWER_UIKIT 1 +#cmakedefine SDL_POWER_HAIKU 1 +#cmakedefine SDL_POWER_EMSCRIPTEN 1 +#cmakedefine SDL_POWER_HARDWIRED 1 +#cmakedefine SDL_POWER_VITA 1 +#cmakedefine SDL_POWER_PSP 1 +#cmakedefine SDL_POWER_N3DS 1 /* Enable system filesystem support */ -#cmakedefine SDL_FILESYSTEM_ANDROID @SDL_FILESYSTEM_ANDROID@ -#cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@ -#cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@ -#cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@ -#cmakedefine SDL_FILESYSTEM_RISCOS @SDL_FILESYSTEM_RISCOS@ -#cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@ -#cmakedefine SDL_FILESYSTEM_WINDOWS @SDL_FILESYSTEM_WINDOWS@ -#cmakedefine SDL_FILESYSTEM_EMSCRIPTEN @SDL_FILESYSTEM_EMSCRIPTEN@ -#cmakedefine SDL_FILESYSTEM_VITA @SDL_FILESYSTEM_VITA@ -#cmakedefine SDL_FILESYSTEM_PSP @SDL_FILESYSTEM_PSP@ -#cmakedefine SDL_FILESYSTEM_PS2 @SDL_FILESYSTEM_PS2@ -#cmakedefine SDL_FILESYSTEM_N3DS @SDL_FILESYSTEM_N3DS@ +#cmakedefine SDL_FILESYSTEM_ANDROID 1 +#cmakedefine SDL_FILESYSTEM_HAIKU 1 +#cmakedefine SDL_FILESYSTEM_COCOA 1 +#cmakedefine SDL_FILESYSTEM_DUMMY 1 +#cmakedefine SDL_FILESYSTEM_RISCOS 1 +#cmakedefine SDL_FILESYSTEM_UNIX 1 +#cmakedefine SDL_FILESYSTEM_WINDOWS 1 +#cmakedefine SDL_FILESYSTEM_EMSCRIPTEN 1 +#cmakedefine SDL_FILESYSTEM_VITA 1 +#cmakedefine SDL_FILESYSTEM_PSP 1 +#cmakedefine SDL_FILESYSTEM_PS2 1 +#cmakedefine SDL_FILESYSTEM_N3DS 1 /* Enable system storage support */ #cmakedefine SDL_STORAGE_STEAM @SDL_STORAGE_STEAM@ /* Enable system FSops support */ -#cmakedefine SDL_FSOPS_POSIX @SDL_FSOPS_POSIX@ -#cmakedefine SDL_FSOPS_WINDOWS @SDL_FSOPS_WINDOWS@ -#cmakedefine SDL_FSOPS_DUMMY @SDL_FSOPS_DUMMY@ +#cmakedefine SDL_FSOPS_POSIX 1 +#cmakedefine SDL_FSOPS_WINDOWS 1 +#cmakedefine SDL_FSOPS_DUMMY 1 /* Enable camera subsystem */ -#cmakedefine SDL_CAMERA_DRIVER_DUMMY @SDL_CAMERA_DRIVER_DUMMY@ -/* !!! FIXME: for later cmakedefine SDL_CAMERA_DRIVER_DISK @SDL_CAMERA_DRIVER_DISK@ */ -#cmakedefine SDL_CAMERA_DRIVER_V4L2 @SDL_CAMERA_DRIVER_V4L2@ -#cmakedefine SDL_CAMERA_DRIVER_COREMEDIA @SDL_CAMERA_DRIVER_COREMEDIA@ -#cmakedefine SDL_CAMERA_DRIVER_ANDROID @SDL_CAMERA_DRIVER_ANDROID@ -#cmakedefine SDL_CAMERA_DRIVER_EMSCRIPTEN @SDL_CAMERA_DRIVER_EMSCRIPTEN@ -#cmakedefine SDL_CAMERA_DRIVER_MEDIAFOUNDATION @SDL_CAMERA_DRIVER_MEDIAFOUNDATION@ -#cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE @SDL_CAMERA_DRIVER_PIPEWIRE@ +#cmakedefine SDL_CAMERA_DRIVER_DUMMY 1 +/* !!! FIXME: for later cmakedefine SDL_CAMERA_DRIVER_DISK 1 */ +#cmakedefine SDL_CAMERA_DRIVER_V4L2 1 +#cmakedefine SDL_CAMERA_DRIVER_COREMEDIA 1 +#cmakedefine SDL_CAMERA_DRIVER_ANDROID 1 +#cmakedefine SDL_CAMERA_DRIVER_EMSCRIPTEN 1 +#cmakedefine SDL_CAMERA_DRIVER_MEDIAFOUNDATION 1 +#cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE 1 #cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC @SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC@ -#cmakedefine SDL_CAMERA_DRIVER_VITA @SDL_CAMERA_DRIVER_VITA@ +#cmakedefine SDL_CAMERA_DRIVER_VITA 1 /* Enable dialog subsystem */ -#cmakedefine SDL_DIALOG_DUMMY @SDL_DIALOG_DUMMY@ +#cmakedefine SDL_DIALOG_DUMMY 1 /* Enable assembly routines */ -#cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@ +#cmakedefine SDL_ALTIVEC_BLITTERS 1 /* Whether SDL_DYNAMIC_API needs dlopen */ -#cmakedefine DYNAPI_NEEDS_DLOPEN @DYNAPI_NEEDS_DLOPEN@ +#cmakedefine DYNAPI_NEEDS_DLOPEN 1 /* Enable ime support */ -#cmakedefine SDL_USE_IME @SDL_USE_IME@ +#cmakedefine SDL_USE_IME 1 #cmakedefine SDL_DISABLE_WINDOWS_IME 1 #cmakedefine SDL_GDK_TEXTINPUT 1 /* Platform specific definitions */ -#cmakedefine SDL_IPHONE_KEYBOARD @SDL_IPHONE_KEYBOARD@ -#cmakedefine SDL_IPHONE_LAUNCHSCREEN @SDL_IPHONE_LAUNCHSCREEN@ +#cmakedefine SDL_IPHONE_KEYBOARD 1 +#cmakedefine SDL_IPHONE_LAUNCHSCREEN 1 -#cmakedefine SDL_VIDEO_VITA_PIB @SDL_VIDEO_VITA_PIB@ -#cmakedefine SDL_VIDEO_VITA_PVR @SDL_VIDEO_VITA_PVR@ -#cmakedefine SDL_VIDEO_VITA_PVR_OGL @SDL_VIDEO_VITA_PVR_OGL@ +#cmakedefine SDL_VIDEO_VITA_PIB 1 +#cmakedefine SDL_VIDEO_VITA_PVR 1 +#cmakedefine SDL_VIDEO_VITA_PVR_OGL 1 /* Libdecor version info */ #define SDL_LIBDECOR_VERSION_MAJOR @SDL_LIBDECOR_VERSION_MAJOR@ From ab8137e436733f970efdc11858eb57a70c6cf78e Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 13:25:10 +0100 Subject: [PATCH 09/10] build_configs: fix spacing I messed up some spacing, so I thought I might as well strip all those unnecessary spaces. --- include/build_config/SDL_build_config.h.cmake | 2 +- .../build_config/SDL_build_config_android.h | 148 ++++++++--------- include/build_config/SDL_build_config_ios.h | 144 ++++++++-------- include/build_config/SDL_build_config_macos.h | 154 +++++++++--------- .../build_config/SDL_build_config_minimal.h | 16 +- include/build_config/SDL_build_config_ngage.h | 46 +++--- .../build_config/SDL_build_config_windows.h | 100 ++++++------ .../build_config/SDL_build_config_wingdk.h | 98 +++++------ include/build_config/SDL_build_config_xbox.h | 90 +++++----- 9 files changed, 399 insertions(+), 399 deletions(-) diff --git a/include/build_config/SDL_build_config.h.cmake b/include/build_config/SDL_build_config.h.cmake index d03a88f67edef..66e2021e44bcf 100644 --- a/include/build_config/SDL_build_config.h.cmake +++ b/include/build_config/SDL_build_config.h.cmake @@ -520,7 +520,7 @@ typedef unsigned __int32 uint32_t; typedef signed __int64 int64_t; typedef unsigned __int64 uint64_t; #ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 +#ifdef _WIN64 typedef unsigned __int64 uintptr_t; #else typedef unsigned int uintptr_t; diff --git a/include/build_config/SDL_build_config_android.h b/include/build_config/SDL_build_config_android.h index 50e0414fd74ae..13bb946948fb4 100644 --- a/include/build_config/SDL_build_config_android.h +++ b/include/build_config/SDL_build_config_android.h @@ -33,7 +33,7 @@ #include -#define HAVE_GCC_ATOMICS 1 +#define HAVE_GCC_ATOMICS 1 #define HAVE_ALLOCA_H 1 #define HAVE_FLOAT_H 1 @@ -41,7 +41,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -51,109 +51,109 @@ #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_LIBC 1 +#define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 -#define HAVE_FDATASYNC 1 +#define HAVE_MALLOC 1 +#define HAVE_FDATASYNC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_PUTENV 1 #define HAVE_SETENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 +#define HAVE_UNSETENV 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 +#define HAVE_MEMMOVE 1 #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 #define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 +#define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 #define HAVE_STRTOK_R 1 #define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_STRTOD 1 -#define HAVE_ATOI 1 +#define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 +#define HAVE_STRNCMP 1 #define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_ACOS 1 -#define HAVE_ACOSF 1 -#define HAVE_ASIN 1 -#define HAVE_ASINF 1 -#define HAVE_ATAN 1 -#define HAVE_ATANF 1 -#define HAVE_ATAN2 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 -#define HAVE_CEIL 1 -#define HAVE_CEILF 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COPYSIGNF 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_EXP 1 -#define HAVE_EXPF 1 -#define HAVE_FABS 1 -#define HAVE_FABSF 1 -#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_CEILF 1 +#define HAVE_COPYSIGN 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_COS 1 +#define HAVE_COSF 1 +#define HAVE_EXP 1 +#define HAVE_EXPF 1 +#define HAVE_FABS 1 +#define HAVE_FABSF 1 +#define HAVE_FLOOR 1 #define HAVE_FLOORF 1 -#define HAVE_FMOD 1 -#define HAVE_FMODF 1 -#define HAVE_ISINF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOGF 1 -#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 #define HAVE_LOG10F 1 #define HAVE_LROUND 1 #define HAVE_LROUNDF 1 -#define HAVE_MODF 1 -#define HAVE_MODFF 1 -#define HAVE_POW 1 -#define HAVE_POWF 1 -#define HAVE_ROUND 1 +#define HAVE_MODF 1 +#define HAVE_MODFF 1 +#define HAVE_POW 1 +#define HAVE_POWF 1 +#define HAVE_ROUND 1 #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SQRTF 1 -#define HAVE_TAN 1 -#define HAVE_TANF 1 -#define HAVE_TRUNC 1 -#define HAVE_TRUNCF 1 +#define HAVE_SCALBNF 1 +#define HAVE_SIN 1 +#define HAVE_SINF 1 +#define HAVE_SQRT 1 +#define HAVE_SQRTF 1 +#define HAVE_TAN 1 +#define HAVE_TANF 1 +#define HAVE_TRUNC 1 +#define HAVE_TRUNCF 1 #define HAVE_SIGACTION 1 #define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 +#define HAVE_NANOSLEEP 1 #define HAVE_GMTIME_R 1 #define HAVE_LOCALTIME_R 1 -#define HAVE_SYSCONF 1 -#define HAVE_CLOCK_GETTIME 1 +#define HAVE_SYSCONF 1 +#define HAVE_CLOCK_GETTIME 1 /* Enable various audio drivers */ #ifndef SDL_AUDIO_DISABLED -#define SDL_AUDIO_DRIVER_OPENSLES 1 -#define SDL_AUDIO_DRIVER_AAUDIO 1 +#define SDL_AUDIO_DRIVER_OPENSLES 1 +#define SDL_AUDIO_DRIVER_AAUDIO 1 #endif /* SDL_AUDIO_DISABLED */ /* Enable various input drivers */ #ifndef SDL_JOYSTICK_DISABLED -#define SDL_JOYSTICK_ANDROID 1 -#define SDL_JOYSTICK_HIDAPI 1 -#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_JOYSTICK_ANDROID 1 +#define SDL_JOYSTICK_HIDAPI 1 +#define SDL_JOYSTICK_VIRTUAL 1 #endif /* SDL_JOYSTICK_DISABLED */ #ifndef SDL_HAPTIC_DISABLED -#define SDL_HAPTIC_ANDROID 1 +#define SDL_HAPTIC_ANDROID 1 #endif /* SDL_HAPTIC_DISABLED */ /* Enable the stub process support */ @@ -161,21 +161,21 @@ /* Enable sensor driver */ #ifndef SDL_SENSOR_DISABLED -#define SDL_SENSOR_ANDROID 1 +#define SDL_SENSOR_ANDROID 1 #endif /* SDL_SENSOR_DISABLED */ /* Enable various shared object loading systems */ -#define SDL_LOADSO_DLOPEN 1 +#define SDL_LOADSO_DLOPEN 1 /* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 /* Enable RTC system */ -#define SDL_TIME_UNIX 1 +#define SDL_TIME_UNIX 1 /* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 +#define SDL_TIMER_UNIX 1 /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_ANDROID 1 @@ -184,7 +184,7 @@ #define SDL_VIDEO_OPENGL_ES 1 #define SDL_VIDEO_OPENGL_ES2 1 #define SDL_VIDEO_OPENGL_EGL 1 -#define SDL_VIDEO_RENDER_OGL_ES2 1 +#define SDL_VIDEO_RENDER_OGL_ES2 1 /* Enable Vulkan support */ #if defined(__ARM_ARCH) && __ARM_ARCH < 7 @@ -200,7 +200,7 @@ #define SDL_POWER_ANDROID 1 /* Enable the filesystem driver */ -#define SDL_FILESYSTEM_ANDROID 1 +#define SDL_FILESYSTEM_ANDROID 1 #define SDL_FSOPS_POSIX 1 /* Enable the camera driver */ diff --git a/include/build_config/SDL_build_config_ios.h b/include/build_config/SDL_build_config_ios.h index 7b81c01b25471..a6b06c53320b3 100644 --- a/include/build_config/SDL_build_config_ios.h +++ b/include/build_config/SDL_build_config_ios.h @@ -25,7 +25,7 @@ #include -#define HAVE_GCC_ATOMICS 1 +#define HAVE_GCC_ATOMICS 1 #define HAVE_ALLOCA_H 1 #define HAVE_FLOAT_H 1 @@ -33,7 +33,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -43,101 +43,101 @@ #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_LIBC 1 +#define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 +#define HAVE_MALLOC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_PUTENV 1 #define HAVE_SETENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 +#define HAVE_UNSETENV 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 +#define HAVE_MEMMOVE 1 #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 #define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 +#define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 #define HAVE_STRTOK_R 1 #define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRPBRK 1 +#define HAVE_STRNCMP 1 +#define HAVE_STRPBRK 1 #define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_ACOS 1 -#define HAVE_ACOSF 1 -#define HAVE_ASIN 1 -#define HAVE_ASINF 1 -#define HAVE_ATAN 1 -#define HAVE_ATANF 1 -#define HAVE_ATAN2 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 -#define HAVE_CEIL 1 -#define HAVE_CEILF 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COPYSIGNF 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_EXP 1 -#define HAVE_EXPF 1 -#define HAVE_FABS 1 -#define HAVE_FABSF 1 -#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_CEILF 1 +#define HAVE_COPYSIGN 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_COS 1 +#define HAVE_COSF 1 +#define HAVE_EXP 1 +#define HAVE_EXPF 1 +#define HAVE_FABS 1 +#define HAVE_FABSF 1 +#define HAVE_FLOOR 1 #define HAVE_FLOORF 1 -#define HAVE_FMOD 1 -#define HAVE_FMODF 1 -#define HAVE_ISINF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOGF 1 -#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 #define HAVE_LOG10F 1 #define HAVE_LROUND 1 #define HAVE_LROUNDF 1 -#define HAVE_MODF 1 -#define HAVE_MODFF 1 -#define HAVE_POW 1 -#define HAVE_POWF 1 -#define HAVE_ROUND 1 +#define HAVE_MODF 1 +#define HAVE_MODFF 1 +#define HAVE_POW 1 +#define HAVE_POWF 1 +#define HAVE_ROUND 1 #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SQRTF 1 -#define HAVE_TAN 1 -#define HAVE_TANF 1 -#define HAVE_TRUNC 1 +#define HAVE_SCALBNF 1 +#define HAVE_SIN 1 +#define HAVE_SINF 1 +#define HAVE_SQRT 1 +#define HAVE_SQRTF 1 +#define HAVE_TAN 1 +#define HAVE_TANF 1 +#define HAVE_TRUNC 1 #define HAVE_TRUNCF 1 -#define HAVE_SIGACTION 1 +#define HAVE_SIGACTION 1 #define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 +#define HAVE_NANOSLEEP 1 #define HAVE_GMTIME_R 1 #define HAVE_LOCALTIME_R 1 #define HAVE_NL_LANGINFO 1 -#define HAVE_SYSCONF 1 +#define HAVE_SYSCONF 1 #define HAVE_SYSCTLBYNAME 1 #define HAVE_O_CLOEXEC 1 /* enable iPhone version of Core Audio driver */ #define SDL_AUDIO_DRIVER_COREAUDIO 1 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ #define SDL_HAPTIC_DUMMY 1 @@ -146,40 +146,40 @@ /* Only enable HIDAPI support if you want to support Steam Controllers on iOS and tvOS */ /*#define SDL_JOYSTICK_HIDAPI 1*/ #define SDL_JOYSTICK_MFI 1 -#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_JOYSTICK_VIRTUAL 1 /* Enable various process implementations */ #define SDL_PROCESS_DUMMY 1 #ifdef SDL_PLATFORM_TVOS -#define SDL_SENSOR_DUMMY 1 +#define SDL_SENSOR_DUMMY 1 #else /* Enable the CoreMotion sensor driver */ -#define SDL_SENSOR_COREMOTION 1 +#define SDL_SENSOR_COREMOTION 1 #endif /* Enable Unix style SO loading */ #define SDL_LOADSO_DLOPEN 1 /* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 /* Enable various RTC system */ -#define SDL_TIME_UNIX 1 +#define SDL_TIME_UNIX 1 /* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 +#define SDL_TIMER_UNIX 1 /* Supported video drivers */ -#define SDL_VIDEO_DRIVER_UIKIT 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_UIKIT 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 /* Enable OpenGL ES */ #if !TARGET_OS_MACCATALYST && !TARGET_OS_VISION #define SDL_VIDEO_OPENGL_ES2 1 #define SDL_VIDEO_OPENGL_ES 1 -#define SDL_VIDEO_RENDER_OGL_ES2 1 +#define SDL_VIDEO_RENDER_OGL_ES2 1 #endif /* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer @@ -210,7 +210,7 @@ #define SDL_IPHONE_LAUNCHSCREEN 1 /* enable filesystem support */ -#define SDL_FILESYSTEM_COCOA 1 +#define SDL_FILESYSTEM_COCOA 1 #define SDL_FSOPS_POSIX 1 /* enable camera support */ diff --git a/include/build_config/SDL_build_config_macos.h b/include/build_config/SDL_build_config_macos.h index 6323355bac99b..9449462e617bb 100644 --- a/include/build_config/SDL_build_config_macos.h +++ b/include/build_config/SDL_build_config_macos.h @@ -38,7 +38,7 @@ #define HAVE_LIMITS_H 1 #define HAVE_MATH_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 +#define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -48,94 +48,94 @@ #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_LIBC 1 +#define HAVE_LIBC 1 #define HAVE_DLOPEN 1 -#define HAVE_MALLOC 1 +#define HAVE_MALLOC 1 #define HAVE_GETENV 1 #define HAVE_GETHOSTNAME 1 #define HAVE_SETENV 1 #define HAVE_PUTENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 +#define HAVE_UNSETENV 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 +#define HAVE_MEMMOVE 1 #define HAVE_MEMCMP 1 #define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 -#define HAVE_STRPBRK 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRLCAT 1 +#define HAVE_STRPBRK 1 #define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 +#define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 #define HAVE_STRTOK_R 1 #define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 +#define HAVE_STRTOUL 1 +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 +#define HAVE_STRNCMP 1 #define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_ACOS 1 -#define HAVE_ACOSF 1 -#define HAVE_ASIN 1 -#define HAVE_ASINF 1 -#define HAVE_ATAN 1 -#define HAVE_ATANF 1 -#define HAVE_ATAN2 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_ACOS 1 +#define HAVE_ACOSF 1 +#define HAVE_ASIN 1 +#define HAVE_ASINF 1 +#define HAVE_ATAN 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 -#define HAVE_CEIL 1 -#define HAVE_CEILF 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COPYSIGNF 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_EXP 1 -#define HAVE_EXPF 1 -#define HAVE_FABS 1 -#define HAVE_FABSF 1 -#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_CEILF 1 +#define HAVE_COPYSIGN 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_COS 1 +#define HAVE_COSF 1 +#define HAVE_EXP 1 +#define HAVE_EXPF 1 +#define HAVE_FABS 1 +#define HAVE_FABSF 1 +#define HAVE_FLOOR 1 #define HAVE_FLOORF 1 -#define HAVE_FMOD 1 -#define HAVE_FMODF 1 -#define HAVE_ISINF 1 +#define HAVE_FMOD 1 +#define HAVE_FMODF 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOGF 1 -#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10 1 #define HAVE_LOG10F 1 #define HAVE_LROUND 1 #define HAVE_LROUNDF 1 -#define HAVE_MODF 1 -#define HAVE_MODFF 1 -#define HAVE_POW 1 -#define HAVE_POWF 1 -#define HAVE_ROUND 1 +#define HAVE_MODF 1 +#define HAVE_MODFF 1 +#define HAVE_POW 1 +#define HAVE_POWF 1 +#define HAVE_ROUND 1 #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SQRTF 1 -#define HAVE_TAN 1 -#define HAVE_TANF 1 -#define HAVE_TRUNC 1 -#define HAVE_TRUNCF 1 -#define HAVE_SIGACTION 1 +#define HAVE_SCALBNF 1 +#define HAVE_SIN 1 +#define HAVE_SINF 1 +#define HAVE_SQRT 1 +#define HAVE_SQRTF 1 +#define HAVE_TAN 1 +#define HAVE_TANF 1 +#define HAVE_TRUNC 1 +#define HAVE_TRUNCF 1 +#define HAVE_SIGACTION 1 #define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 +#define HAVE_NANOSLEEP 1 #define HAVE_GMTIME_R 1 #define HAVE_LOCALTIME_R 1 #define HAVE_NL_LANGINFO 1 -#define HAVE_SYSCONF 1 +#define HAVE_SYSCONF 1 #define HAVE_SYSCTLBYNAME 1 #if defined(__has_include) && (defined(__i386__) || defined(__x86_64)) @@ -151,15 +151,15 @@ #define HAVE_GCC_ATOMICS 1 /* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_COREAUDIO 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_COREAUDIO 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable various input drivers */ #define SDL_JOYSTICK_HIDAPI 1 -#define SDL_JOYSTICK_IOKIT 1 -#define SDL_JOYSTICK_VIRTUAL 1 -#define SDL_HAPTIC_IOKIT 1 +#define SDL_JOYSTICK_IOKIT 1 +#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_HAPTIC_IOKIT 1 /* The MFI controller support requires ARC Objective C runtime */ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__) @@ -170,24 +170,24 @@ #define SDL_PROCESS_POSIX 1 /* Enable the dummy sensor driver */ -#define SDL_SENSOR_DUMMY 1 +#define SDL_SENSOR_DUMMY 1 /* Enable various shared object loading systems */ -#define SDL_LOADSO_DLOPEN 1 +#define SDL_LOADSO_DLOPEN 1 /* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 /* Enable various RTC system */ -#define SDL_TIME_UNIX 1 +#define SDL_TIME_UNIX 1 /* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 +#define SDL_TIMER_UNIX 1 /* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_COCOA 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_COCOA 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_OFFSCREEN 1 #undef SDL_VIDEO_DRIVER_X11 #define SDL_VIDEO_DRIVER_X11_DYNAMIC "/opt/X11/lib/libX11.6.dylib" @@ -211,7 +211,7 @@ #define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 #endif -#define SDL_VIDEO_RENDER_OGL 1 +#define SDL_VIDEO_RENDER_OGL 1 #define SDL_VIDEO_RENDER_OGL_ES2 1 /* Metal only supported on 64-bit architectures with 10.11+ */ @@ -243,7 +243,7 @@ #define SDL_POWER_MACOSX 1 /* enable filesystem support */ -#define SDL_FILESYSTEM_COCOA 1 +#define SDL_FILESYSTEM_COCOA 1 #define SDL_FSOPS_POSIX 1 /* enable camera support */ @@ -252,7 +252,7 @@ /* Enable assembly routines */ #ifdef __ppc__ -#define SDL_ALTIVEC_BLITTERS 1 +#define SDL_ALTIVEC_BLITTERS 1 #endif #endif /* SDL_build_config_macos_h_ */ diff --git a/include/build_config/SDL_build_config_minimal.h b/include/build_config/SDL_build_config_minimal.h index d22567a95a46c..6ae04eb37a558 100644 --- a/include/build_config/SDL_build_config_minimal.h +++ b/include/build_config/SDL_build_config_minimal.h @@ -31,8 +31,8 @@ * This is the minimal configuration that can be used to build SDL. */ -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDDEF_H 1 #if !defined(HAVE_STDINT_H) && !defined(_STDINT_H_) /* Most everything except Visual Studio 2008 and earlier has stdint.h now */ @@ -62,10 +62,10 @@ typedef unsigned int uintptr_t; #endif /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ -#define SDL_JOYSTICK_DISABLED 1 +#define SDL_JOYSTICK_DISABLED 1 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ #define SDL_HAPTIC_DISABLED 1 @@ -83,17 +83,17 @@ typedef unsigned int uintptr_t; #define SDL_LOADSO_DUMMY 1 /* Enable the stub thread support (src/thread/generic/\*.c) */ -#define SDL_THREADS_DISABLED 1 +#define SDL_THREADS_DISABLED 1 /* Enable the dummy video driver (src/video/dummy/\*.c) */ -#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_DUMMY 1 /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */ -#define SDL_FILESYSTEM_DUMMY 1 +#define SDL_FILESYSTEM_DUMMY 1 #define SDL_FSOPS_DUMMY 1 /* Enable the camera driver (src/camera/dummy/\*.c) */ -#define SDL_CAMERA_DRIVER_DUMMY 1 +#define SDL_CAMERA_DRIVER_DUMMY 1 /* Enable dialog subsystem */ #define SDL_DIALOG_DUMMY 1 diff --git a/include/build_config/SDL_build_config_ngage.h b/include/build_config/SDL_build_config_ngage.h index 9ccf75a89c47a..19e07d670dba3 100644 --- a/include/build_config/SDL_build_config_ngage.h +++ b/include/build_config/SDL_build_config_ngage.h @@ -35,41 +35,41 @@ typedef signed long long int64_t; typedef unsigned long long uint64_t; typedef unsigned long uintptr_t; -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 -#define HAVE_STDIO_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_MATH_H 1 -#define HAVE_CEIL 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COS 1 -#define HAVE_EXP 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_LOG10 1 -#define HAVE_SCALBN 1 -#define HAVE_SIN 1 -#define HAVE_SQRT 1 -#define HAVE_TAN 1 -#define HAVE_MALLOC 1 -#define SDL_MAIN_NEEDED 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDDEF_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_MATH_H 1 +#define HAVE_CEIL 1 +#define HAVE_COPYSIGN 1 +#define HAVE_COS 1 +#define HAVE_EXP 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_LOG 1 +#define HAVE_LOG10 1 +#define HAVE_SCALBN 1 +#define HAVE_SIN 1 +#define HAVE_SQRT 1 +#define HAVE_TAN 1 +#define HAVE_MALLOC 1 +#define SDL_MAIN_NEEDED 1 #define LACKS_SYS_MMAN_H 1 /* Enable the N-Gage thread support (src/thread/ngage/\*.c) */ #define SDL_THREAD_NGAGE 1 /* Enable the N-Gage timer support (src/timer/ngage/\*.c) */ -#define SDL_TIMER_NGAGE 1 +#define SDL_TIMER_NGAGE 1 /* Enable the N-Gage video driver (src/video/ngage/\*.c) */ #define SDL_VIDEO_DRIVER_NGAGE 1 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ -#define SDL_JOYSTICK_DISABLED 1 +#define SDL_JOYSTICK_DISABLED 1 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ #define SDL_HAPTIC_DISABLED 1 @@ -91,7 +91,7 @@ typedef unsigned long uintptr_t; #define SDL_FSOPS_DUMMY 1 /* Enable the camera driver (src/camera/dummy/\*.c) */ -#define SDL_CAMERA_DRIVER_DUMMY 1 +#define SDL_CAMERA_DRIVER_DUMMY 1 /* Enable dialog subsystem */ #define SDL_DIALOG_DUMMY 1 diff --git a/include/build_config/SDL_build_config_windows.h b/include/build_config/SDL_build_config_windows.h index 9522c91d41fdb..fd7cc0cb6fe76 100644 --- a/include/build_config/SDL_build_config_windows.h +++ b/include/build_config/SDL_build_config_windows.h @@ -113,7 +113,7 @@ typedef unsigned int uintptr_t; /* This can be disabled to avoid C runtime dependencies and manifest requirements */ #ifndef HAVE_LIBC -#define HAVE_LIBC 1 +#define HAVE_LIBC 1 #endif #if HAVE_LIBC @@ -130,7 +130,7 @@ typedef unsigned int uintptr_t; #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_MALLOC 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -152,46 +152,46 @@ typedef unsigned int uintptr_t; #define HAVE_ATOF 1 #define HAVE_STRCMP 1 #define HAVE_STRNCMP 1 -#define HAVE_STRPBRK 1 +#define HAVE_STRPBRK 1 #define HAVE_VSSCANF 1 #define HAVE_VSNPRINTF 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_CEIL 1 -#define HAVE_COS 1 -#define HAVE_EXP 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_FMOD 1 -#define HAVE_ISINF 1 +#define HAVE_ACOS 1 +#define HAVE_ASIN 1 +#define HAVE_ATAN 1 +#define HAVE_ATAN2 1 +#define HAVE_CEIL 1 +#define HAVE_COS 1 +#define HAVE_EXP 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_FMOD 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOG10 1 -#define HAVE_POW 1 -#define HAVE_SIN 1 -#define HAVE_SQRT 1 -#define HAVE_TAN 1 -#define HAVE_ACOSF 1 -#define HAVE_ASINF 1 -#define HAVE_ATANF 1 +#define HAVE_LOG 1 +#define HAVE_LOG10 1 +#define HAVE_POW 1 +#define HAVE_SIN 1 +#define HAVE_SQRT 1 +#define HAVE_TAN 1 +#define HAVE_ACOSF 1 +#define HAVE_ASINF 1 +#define HAVE_ATANF 1 #define HAVE_ATAN2F 1 -#define HAVE_CEILF 1 +#define HAVE_CEILF 1 #define HAVE__COPYSIGN 1 -#define HAVE_COSF 1 -#define HAVE_EXPF 1 -#define HAVE_FABSF 1 +#define HAVE_COSF 1 +#define HAVE_EXPF 1 +#define HAVE_FABSF 1 #define HAVE_FLOORF 1 -#define HAVE_FMODF 1 -#define HAVE_LOGF 1 +#define HAVE_FMODF 1 +#define HAVE_LOGF 1 #define HAVE_LOG10F 1 -#define HAVE_POWF 1 -#define HAVE_SINF 1 -#define HAVE_SQRTF 1 -#define HAVE_TANF 1 +#define HAVE_POWF 1 +#define HAVE_SINF 1 +#define HAVE_SQRTF 1 +#define HAVE_TANF 1 #ifdef _MSC_VER /* These functions were added with the VC++ 2013 C runtime library */ #if _MSC_VER >= 1800 @@ -204,7 +204,7 @@ typedef unsigned int uintptr_t; #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 #define HAVE_SCALBNF 1 -#define HAVE_TRUNC 1 +#define HAVE_TRUNC 1 #define HAVE_TRUNCF 1 #endif /* This function is available with at least the VC++ 2008 C runtime library */ @@ -213,8 +213,8 @@ typedef unsigned int uintptr_t; #endif #endif /* _MSC_VER */ #else -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDDEF_H 1 #endif /* Enable various audio drivers */ @@ -222,8 +222,8 @@ typedef unsigned int uintptr_t; #define SDL_AUDIO_DRIVER_WASAPI 1 #endif #define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable various input drivers */ #define SDL_JOYSTICK_DINPUT 1 @@ -231,37 +231,37 @@ typedef unsigned int uintptr_t; #define SDL_JOYSTICK_GAMEINPUT 1 #endif #define SDL_JOYSTICK_HIDAPI 1 -#define SDL_JOYSTICK_RAWINPUT 1 -#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_JOYSTICK_RAWINPUT 1 +#define SDL_JOYSTICK_VIRTUAL 1 #ifdef HAVE_WINDOWS_GAMING_INPUT_H -#define SDL_JOYSTICK_WGI 1 +#define SDL_JOYSTICK_WGI 1 #endif #define SDL_JOYSTICK_XINPUT 1 -#define SDL_HAPTIC_DINPUT 1 +#define SDL_HAPTIC_DINPUT 1 /* Enable various process implementations */ #define SDL_PROCESS_WINDOWS 1 /* Enable the sensor driver */ #ifdef HAVE_SENSORSAPI_H -#define SDL_SENSOR_WINDOWS 1 +#define SDL_SENSOR_WINDOWS 1 #else -#define SDL_SENSOR_DUMMY 1 +#define SDL_SENSOR_DUMMY 1 #endif /* Enable various shared object loading systems */ -#define SDL_LOADSO_WINDOWS 1 +#define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ #define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_GENERIC_RWLOCK_SUFFIX 1 -#define SDL_THREAD_WINDOWS 1 +#define SDL_THREAD_WINDOWS 1 /* Enable RTC system */ -#define SDL_TIME_WINDOWS 1 +#define SDL_TIME_WINDOWS 1 /* Enable various timer systems */ -#define SDL_TIMER_WINDOWS 1 +#define SDL_TIMER_WINDOWS 1 /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_DUMMY 1 @@ -297,7 +297,7 @@ typedef unsigned int uintptr_t; #define SDL_POWER_WINDOWS 1 /* Enable filesystem support */ -#define SDL_FILESYSTEM_WINDOWS 1 +#define SDL_FILESYSTEM_WINDOWS 1 #define SDL_FSOPS_WINDOWS 1 /* Enable the camera driver */ diff --git a/include/build_config/SDL_build_config_wingdk.h b/include/build_config/SDL_build_config_wingdk.h index ec055e1ec5869..d26e2cb0fabfc 100644 --- a/include/build_config/SDL_build_config_wingdk.h +++ b/include/build_config/SDL_build_config_wingdk.h @@ -71,8 +71,8 @@ #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_LIBC 1 -#define HAVE_MALLOC 1 +#define HAVE_LIBC 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -93,44 +93,44 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_CEIL 1 -#define HAVE_COS 1 -#define HAVE_EXP 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_FMOD 1 -#define HAVE_ISINF 1 +#define HAVE_STRNCMP 1 +#define HAVE_ACOS 1 +#define HAVE_ASIN 1 +#define HAVE_ATAN 1 +#define HAVE_ATAN2 1 +#define HAVE_CEIL 1 +#define HAVE_COS 1 +#define HAVE_EXP 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_FMOD 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOG10 1 -#define HAVE_POW 1 -#define HAVE_SIN 1 -#define HAVE_SQRT 1 -#define HAVE_TAN 1 -#define HAVE_ACOSF 1 -#define HAVE_ASINF 1 -#define HAVE_ATANF 1 +#define HAVE_LOG 1 +#define HAVE_LOG10 1 +#define HAVE_POW 1 +#define HAVE_SIN 1 +#define HAVE_SQRT 1 +#define HAVE_TAN 1 +#define HAVE_ACOSF 1 +#define HAVE_ASINF 1 +#define HAVE_ATANF 1 #define HAVE_ATAN2F 1 -#define HAVE_CEILF 1 +#define HAVE_CEILF 1 #define HAVE__COPYSIGN 1 -#define HAVE_COSF 1 -#define HAVE_EXPF 1 -#define HAVE_FABSF 1 +#define HAVE_COSF 1 +#define HAVE_EXPF 1 +#define HAVE_FABSF 1 #define HAVE_FLOORF 1 -#define HAVE_FMODF 1 -#define HAVE_LOGF 1 +#define HAVE_FMODF 1 +#define HAVE_LOGF 1 #define HAVE_LOG10F 1 -#define HAVE_POWF 1 -#define HAVE_SINF 1 -#define HAVE_SQRTF 1 -#define HAVE_TANF 1 +#define HAVE_POWF 1 +#define HAVE_SINF 1 +#define HAVE_SQRTF 1 +#define HAVE_TANF 1 #ifdef _MSC_VER /* These functions were added with the VC++ 2013 C runtime library */ #define HAVE_STRTOLL 1 @@ -142,7 +142,7 @@ #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 #define HAVE_SCALBNF 1 -#define HAVE_TRUNC 1 +#define HAVE_TRUNC 1 #define HAVE_TRUNCF 1 #define HAVE__FSEEKI64 1 #endif /* _MSC_VER */ @@ -152,42 +152,42 @@ #define SDL_AUDIO_DRIVER_WASAPI 1 #endif #define SDL_AUDIO_DRIVER_DSOUND 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable various input drivers */ #define SDL_JOYSTICK_DINPUT 1 #define SDL_JOYSTICK_GAMEINPUT 1 #define SDL_JOYSTICK_HIDAPI 1 -#define SDL_JOYSTICK_RAWINPUT 1 -#define SDL_JOYSTICK_VIRTUAL 1 -#define SDL_JOYSTICK_WGI 1 +#define SDL_JOYSTICK_RAWINPUT 1 +#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_JOYSTICK_WGI 1 #define SDL_JOYSTICK_XINPUT 1 -#define SDL_HAPTIC_DINPUT 1 +#define SDL_HAPTIC_DINPUT 1 /* Enable various process implementations */ #define SDL_PROCESS_WINDOWS 1 /* Enable the sensor driver */ #ifdef HAVE_SENSORSAPI_H -#define SDL_SENSOR_WINDOWS 1 +#define SDL_SENSOR_WINDOWS 1 #else -#define SDL_SENSOR_DUMMY 1 +#define SDL_SENSOR_DUMMY 1 #endif /* Enable various shared object loading systems */ -#define SDL_LOADSO_WINDOWS 1 +#define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ #define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_GENERIC_RWLOCK_SUFFIX 1 -#define SDL_THREAD_WINDOWS 1 +#define SDL_THREAD_WINDOWS 1 /* Enable various time systems */ -#define SDL_TIME_WINDOWS 1 +#define SDL_TIME_WINDOWS 1 /* Enable various timer systems */ -#define SDL_TIMER_WINDOWS 1 +#define SDL_TIMER_WINDOWS 1 /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_DUMMY 1 @@ -222,11 +222,11 @@ #define SDL_POWER_WINDOWS 1 /* Enable filesystem support */ -#define SDL_FILESYSTEM_WINDOWS 1 +#define SDL_FILESYSTEM_WINDOWS 1 #define SDL_FSOPS_WINDOWS 1 /* Enable the camera driver (src/camera/dummy/\*.c) */ /* !!! FIXME */ -#define SDL_CAMERA_DRIVER_DUMMY 1 +#define SDL_CAMERA_DRIVER_DUMMY 1 /* Use the (inferior) GDK text input method for GDK platforms */ /*#define SDL_GDK_TEXTINPUT 1*/ diff --git a/include/build_config/SDL_build_config_xbox.h b/include/build_config/SDL_build_config_xbox.h index e2f0788ffe9cb..a79db9164a51b 100644 --- a/include/build_config/SDL_build_config_xbox.h +++ b/include/build_config/SDL_build_config_xbox.h @@ -69,8 +69,8 @@ #define HAVE_WCHAR_H 1 /* C library functions */ -#define HAVE_LIBC 1 -#define HAVE_MALLOC 1 +#define HAVE_LIBC 1 +#define HAVE_MALLOC 1 #define HAVE_ABS 1 #define HAVE_MEMSET 1 #define HAVE_MEMCPY 1 @@ -92,44 +92,44 @@ #define HAVE_ATOI 1 #define HAVE_ATOF 1 #define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_CEIL 1 -#define HAVE_COS 1 -#define HAVE_EXP 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_FMOD 1 -#define HAVE_ISINF 1 +#define HAVE_STRNCMP 1 +#define HAVE_ACOS 1 +#define HAVE_ASIN 1 +#define HAVE_ATAN 1 +#define HAVE_ATAN2 1 +#define HAVE_CEIL 1 +#define HAVE_COS 1 +#define HAVE_EXP 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_FMOD 1 +#define HAVE_ISINF 1 #define HAVE_ISINF_FLOAT_MACRO 1 -#define HAVE_ISNAN 1 +#define HAVE_ISNAN 1 #define HAVE_ISNAN_FLOAT_MACRO 1 -#define HAVE_LOG 1 -#define HAVE_LOG10 1 -#define HAVE_POW 1 -#define HAVE_SIN 1 -#define HAVE_SQRT 1 -#define HAVE_TAN 1 -#define HAVE_ACOSF 1 -#define HAVE_ASINF 1 -#define HAVE_ATANF 1 +#define HAVE_LOG 1 +#define HAVE_LOG10 1 +#define HAVE_POW 1 +#define HAVE_SIN 1 +#define HAVE_SQRT 1 +#define HAVE_TAN 1 +#define HAVE_ACOSF 1 +#define HAVE_ASINF 1 +#define HAVE_ATANF 1 #define HAVE_ATAN2F 1 -#define HAVE_CEILF 1 +#define HAVE_CEILF 1 #define HAVE__COPYSIGN 1 -#define HAVE_COSF 1 -#define HAVE_EXPF 1 -#define HAVE_FABSF 1 +#define HAVE_COSF 1 +#define HAVE_EXPF 1 +#define HAVE_FABSF 1 #define HAVE_FLOORF 1 -#define HAVE_FMODF 1 -#define HAVE_LOGF 1 +#define HAVE_FMODF 1 +#define HAVE_LOGF 1 #define HAVE_LOG10F 1 -#define HAVE_POWF 1 -#define HAVE_SINF 1 -#define HAVE_SQRTF 1 -#define HAVE_TANF 1 +#define HAVE_POWF 1 +#define HAVE_SINF 1 +#define HAVE_SQRTF 1 +#define HAVE_TANF 1 #ifdef _MSC_VER /* These functions were added with the VC++ 2013 C runtime library */ #define HAVE_STRTOLL 1 @@ -141,7 +141,7 @@ #define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 #define HAVE_SCALBNF 1 -#define HAVE_TRUNC 1 +#define HAVE_TRUNC 1 #define HAVE_TRUNCF 1 #define HAVE__FSEEKI64 1 #endif /* _MSC_VER */ @@ -151,11 +151,11 @@ #define SDL_AUDIO_DRIVER_WASAPI 1 #endif /*#define SDL_AUDIO_DRIVER_DSOUND 1*/ -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 /* Enable various input drivers */ -#define SDL_JOYSTICK_VIRTUAL 1 +#define SDL_JOYSTICK_VIRTUAL 1 /* This is XInputOnGameInput for GDK platforms: */ /*#define SDL_JOYSTICK_XINPUT 1*/ /* Native GameInput: */ @@ -167,24 +167,24 @@ /* Enable the sensor driver */ #ifdef HAVE_SENSORSAPI_H -#define SDL_SENSOR_WINDOWS 1 +#define SDL_SENSOR_WINDOWS 1 #else -#define SDL_SENSOR_DUMMY 1 +#define SDL_SENSOR_DUMMY 1 #endif /* Enable various shared object loading systems */ -#define SDL_LOADSO_WINDOWS 1 +#define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ #define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_GENERIC_RWLOCK_SUFFIX 1 -#define SDL_THREAD_WINDOWS 1 +#define SDL_THREAD_WINDOWS 1 /* Enable various time systems */ -#define SDL_TIME_WINDOWS 1 +#define SDL_TIME_WINDOWS 1 /* Enable various timer systems */ -#define SDL_TIMER_WINDOWS 1 +#define SDL_TIMER_WINDOWS 1 /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_DUMMY 1 @@ -215,7 +215,7 @@ #define SDL_GDK_TEXTINPUT 1 /* Enable the camera driver (src/camera/dummy/\*.c) */ -#define SDL_CAMERA_DRIVER_DUMMY 1 +#define SDL_CAMERA_DRIVER_DUMMY 1 /* Enable dialog subsystem */ #define SDL_DIALOG_DUMMY 1 From 44ae21d383ae9c2a6c46bfd3141f45dfe4f86e53 Mon Sep 17 00:00:00 2001 From: L zard Date: Sat, 2 Nov 2024 21:31:43 +0100 Subject: [PATCH 10/10] SDL_revision: make sure `SDL_REVISION` and `SDL_VENDOR_INFO` are defined ...and that `SDL_VENDOR_INFO` is included in `SDL_REVISION`. --- include/build_config/SDL_revision.h.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/build_config/SDL_revision.h.cmake b/include/build_config/SDL_revision.h.cmake index d002306f2b159..f408b05cca356 100644 --- a/include/build_config/SDL_revision.h.cmake +++ b/include/build_config/SDL_revision.h.cmake @@ -31,9 +31,21 @@ #cmakedefine SDL_VENDOR_INFO "@SDL_VENDOR_INFO@" #ifdef SDL_VENDOR_INFO -#define SDL_REVISION "@SDL_REVISION@ (" SDL_VENDOR_INFO ")" +#cmakedefine SDL_REVISION "@SDL_REVISION@ (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "@SDL_REVISION@" +#cmakedefine SDL_REVISION "@SDL_REVISION@" +#endif + +#ifndef SDL_REVISION +#ifdef SDL_VENDOR_INFO +#define SDL_REVISION SDL_VENDOR_INFO +#else +#define SDL_REVISION "" +#endif +#endif + +#ifndef SDL_VENDOR_INFO +#define SDL_VENDOR_INFO "" #endif #endif /* SDL_revision_h_ */