mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
sdlayer: Don't set the window icon from code if we are linked with SDL >= 2.0.5 on Windows, since it will now automatically use the first icon in the exe.
git-svn-id: https://svn.eduke32.com/eduke32@5904 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
86201254bd
commit
843ac9c924
1 changed files with 11 additions and 3 deletions
|
@ -276,10 +276,18 @@ void wm_setapptitle(const char *name)
|
||||||
if (appicon && sdl_surface)
|
if (appicon && sdl_surface)
|
||||||
SDL_WM_SetIcon(appicon, 0);
|
SDL_WM_SetIcon(appicon, 0);
|
||||||
#else
|
#else
|
||||||
|
if (sdl_window)
|
||||||
|
{
|
||||||
SDL_SetWindowTitle(sdl_window, apptitle);
|
SDL_SetWindowTitle(sdl_window, apptitle);
|
||||||
|
|
||||||
if (appicon)
|
if (appicon)
|
||||||
|
{
|
||||||
|
#if defined _WIN32
|
||||||
|
if (!EDUKE32_SDL_LINKED_PREREQ(linked, 2, 0, 5))
|
||||||
|
#endif
|
||||||
SDL_SetWindowIcon(sdl_window, appicon);
|
SDL_SetWindowIcon(sdl_window, appicon);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
startwin_settitle(apptitle);
|
startwin_settitle(apptitle);
|
||||||
|
|
Loading…
Reference in a new issue