eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL_main for Win32: Get rid of console_*main, add wWinMain()

Browse source 
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()
This commit is contained in:
Daniel Gibson 2022-12-30 06:16:22 +01:00 • committed by Sam Lantinga
parent 98678b5d8d
commit ac8a041541
1 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

37
include/SDL3/SDL_main_impl.h
View file

@ -56,40 +56,29 @@ extern "C" {
typedef struct HINSTANCE__ * HINSTANCE; typedef struct HINSTANCE__ * HINSTANCE;
typedef char* LPSTR; typedef char* LPSTR;
typedef wchar_t* PWSTR;
#ifndef __GDK__ /* this is only needed for Win32 */ /* The VC++ compiler needs main/wmain defined, but not for GDK */
#if defined(_MSC_VER) && !defined(__GDK__)
#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
/* This is where execution begins [console apps] */
#if defined( UNICODE ) && UNICODE #if defined( UNICODE ) && UNICODE
/* This is where execution begins [console apps, unicode] */ int wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
int
console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp)
{
return SDL_RunApp(0, NULL, SDL_main, NULL);
}
#else /* ANSI */ #else /* ANSI */
int main(int argc, char *argv[])
/* This is where execution begins [console apps, ansi] */ #endif
int
console_ansi_main(int argc, char *argv[])
{ {
return SDL_RunApp(0, NULL, SDL_main, NULL); 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] */ /* This is where execution begins [windowed apps and GDK] */
int WINAPI #if defined( UNICODE ) && UNICODE
WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) 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); return SDL_RunApp(0, NULL, SDL_main, NULL);
} }