From 2654c52d0e03578ea002dc62603a3f48e1353829 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 24 Jan 2024 20:37:00 +0300 Subject: [PATCH] macro SDL_PLATFORM_WINDOWS now means Win32 api and Windows-based OS's. macro SDL_PLATFORM_WIN32 means desktop windows, i.e. anything other than WinRT or GDK, etc. --- include/SDL3/SDL_platform_defines.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/SDL3/SDL_platform_defines.h b/include/SDL3/SDL_platform_defines.h index d55f8a9d85..9a2154a8ec 100644 --- a/include/SDL3/SDL_platform_defines.h +++ b/include/SDL3/SDL_platform_defines.h @@ -132,7 +132,9 @@ #define SDL_PLATFORM_CYGWIN 1 #endif -#if defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN) || defined(__MINGW32__) +#if defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN) +#define SDL_PLATFORM_WINDOWS 1 /* Win32 api and Windows-based OSs */ + /* Try to find out if we're compiling for WinRT, GDK or non-WinRT/GDK */ #if defined(_MSC_VER) && defined(__has_include) #if __has_include() @@ -170,13 +172,10 @@ #elif defined(_GAMING_XBOX_SCARLETT) #define SDL_PLATFORM_XBOXSERIES 1 #else -#define SDL_PLATFORM_WINDOWS 1 +#define SDL_PLATFORM_WIN32 1 #endif #endif /* defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN) */ -#ifdef SDL_PLATFORM_WINDOWS -#define SDL_PLATFORM_WIN32 1 -#endif /* This is to support generic "any GDK" separate from a platform-specific GDK */ #if defined(SDL_PLATFORM_WINGDK) || defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #define SDL_PLATFORM_GDK 1