mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-04 01:34:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wikiheaders: Allow basic typedefs to pull in some preprocessor logic.

Browse Source 
Reference Issue #9557.

This lets SDL_AudioFormat have the `#if byteorder == lilendian` section.
This commit is contained in:
Ryan C. Gordon
2024-04-25 16:42:44 -04:00
parent a13bdeee8a
commit 6b1a98e664
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-scripts/wikiheaders.pl
View File

@@ -860,6 +860,7 @@ while (my $d = readdir(DH)) {
} }
# We assume any `#define`s directly after the typedef are related to it: probably bitflags for an integer typedef. # We assume any `#define`s directly after the typedef are related to it: probably bitflags for an integer typedef.
# We'll also allow lines that start with `#if` or `#else` or `#elif`
# Blank lines are allowed, anything else, even comments, are not. # Blank lines are allowed, anything else, even comments, are not.
my $blank_lines = 0; my $blank_lines = 0;
my $lastpos = tell(FH); my $lastpos = tell(FH);
@@ -869,7 +870,7 @@ while (my $d = readdir(DH)) {
if (/\A\s*\Z/) { if (/\A\s*\Z/) {
$blank_lines++; $blank_lines++;
} elsif (/\A\s*\#define\s+/) { } elsif (/\A\s*\#(define|if|else|elif)(\s+|\Z)/) {
if ($blank_lines > 0) { if ($blank_lines > 0) {
while ($blank_lines > 0) { while ($blank_lines > 0) {
$additional_decl .= "\n"; $additional_decl .= "\n";

19
include/SDL3/SDL_audio.h
View File

@@ -98,6 +98,16 @@ typedef Uint16 SDL_AudioFormat;
#define SDL_AUDIO_F32LE 0x8120 /**< 32-bit floating point samples */ #define SDL_AUDIO_F32LE 0x8120 /**< 32-bit floating point samples */
#define SDL_AUDIO_F32BE 0x9120 /**< As above, but big-endian byte order */ #define SDL_AUDIO_F32BE 0x9120 /**< As above, but big-endian byte order */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define SDL_AUDIO_S16 SDL_AUDIO_S16LE
#define SDL_AUDIO_S32 SDL_AUDIO_S32LE
#define SDL_AUDIO_F32 SDL_AUDIO_F32LE
#else
#define SDL_AUDIO_S16 SDL_AUDIO_S16BE
#define SDL_AUDIO_S32 SDL_AUDIO_S32BE
#define SDL_AUDIO_F32 SDL_AUDIO_F32BE
#endif
/* masks for different parts of SDL_AudioFormat. */ /* masks for different parts of SDL_AudioFormat. */
#define SDL_AUDIO_MASK_BITSIZE (0xFF) #define SDL_AUDIO_MASK_BITSIZE (0xFF)
@@ -218,15 +228,6 @@ typedef Uint16 SDL_AudioFormat;
*/ */
#define SDL_AUDIO_ISUNSIGNED(x) (!SDL_AUDIO_ISSIGNED(x)) #define SDL_AUDIO_ISUNSIGNED(x) (!SDL_AUDIO_ISSIGNED(x))
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define SDL_AUDIO_S16 SDL_AUDIO_S16LE
#define SDL_AUDIO_S32 SDL_AUDIO_S32LE
#define SDL_AUDIO_F32 SDL_AUDIO_F32LE
#else
#define SDL_AUDIO_S16 SDL_AUDIO_S16BE
#define SDL_AUDIO_S32 SDL_AUDIO_S32BE
#define SDL_AUDIO_F32 SDL_AUDIO_F32BE
#endif
/** /**
* SDL Audio Device instance IDs. * SDL Audio Device instance IDs.

7
include/SDL3/SDL_thread.h
View File

@@ -83,11 +83,7 @@ typedef enum SDL_ThreadPriority {
*/ */
typedef int (SDLCALL * SDL_ThreadFunction) (void *data); typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
/*
#if (defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)) && !defined(SDL_PLATFORM_WINRT)
/**
* \file SDL_thread.h
*
* We compile SDL into a DLL. This means, that it's the DLL which * We compile SDL into a DLL. This means, that it's the DLL which
* creates a new thread for the calling process with the SDL_CreateThread() * creates a new thread for the calling process with the SDL_CreateThread()
* API. There is a problem with this, that only the RTL of the SDL3.DLL will * API. There is a problem with this, that only the RTL of the SDL3.DLL will
@@ -105,6 +101,7 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
* Always use the _beginthread() and _endthread() of the calling runtime * Always use the _beginthread() and _endthread() of the calling runtime
* library! * library!
*/ */
#if (defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_GDK)) && !defined(SDL_PLATFORM_WINRT)
#define SDL_PASSED_BEGINTHREAD_ENDTHREAD #define SDL_PASSED_BEGINTHREAD_ENDTHREAD
typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread) typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread)