From ac8a04154128e53f48ad5f2a00e0c03e6f5cf716 Mon Sep 17 00:00:00 2001
From: Daniel Gibson <[EMAIL REDACTED]>
Date: Fri, 30 Dec 2022 06:16:22 +0100
Subject: [PATCH] SDL_main for Win32: Get rid of console_*main, add wWinMain()
I don't think there's any point in console_*main() for non-MSVC - I think
it can't be called anyway now that SDL_main is header-only.
So I renamed those functions to main() and wmain() and made them MSVC-only
For reference, MinGW (at least the version I tested) supports both main()
and WinMain(), no matter if compiled with -mconsole or -mwindows (it seems
to prefer main() over WinMain() if both are available, in both cases).
But when building with -municode, it needs wmain() or wWinMain(), so
that case is now handled with wWinMain()
---
include/SDL3/SDL_main_impl.h | 37 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/include/SDL3/SDL_main_impl.h b/include/SDL3/SDL_main_impl.h
index 230fea9a9dca..3575ea71c17e 100644
--- a/include/SDL3/SDL_main_impl.h
+++ b/include/SDL3/SDL_main_impl.h
@@ -56,40 +56,29 @@ extern "C" {
typedef struct HINSTANCE__ * HINSTANCE;
typedef char* LPSTR;
+typedef wchar_t* PWSTR;
-#ifndef __GDK__ /* this is only needed for Win32 */
-
-#if defined(_MSC_VER)
-/* The VC++ compiler needs main/wmain defined */
-# define console_ansi_main main
-# if defined(UNICODE) && UNICODE
-# define console_wmain wmain
-# endif
-#endif
+/* The VC++ compiler needs main/wmain defined, but not for GDK */
+#if defined(_MSC_VER) && !defined(__GDK__)
+/* This is where execution begins [console apps] */
#if defined( UNICODE ) && UNICODE
-/* This is where execution begins [console apps, unicode] */
-int
-console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
-{
- return SDL_RunApp(0, NULL, SDL_main, NULL);
-}
-
+int wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
#else /* ANSI */
-
-/* This is where execution begins [console apps, ansi] */
-int
-console_ansi_main(int argc, char *argv[])
+int main(int argc, char *argv[])
+#endif
{
return SDL_RunApp(0, NULL, SDL_main, NULL);
}
-#endif /* UNICODE/ANSI */
-#endif /* not __GDK__ */
+#endif /* _MSC_VER && ! __GDK__ */
/* This is where execution begins [windowed apps and GDK] */
-int WINAPI
-WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
+#if defined( UNICODE ) && UNICODE
+int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, PWSTR szCmdLine, int sw)
+#else /* ANSI */
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
+#endif
{
return SDL_RunApp(0, NULL, SDL_main, NULL);
}