matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Linux icon variable declaration sitting inside a Windows Platform block

Browse Source
This commit is contained in:
Simon Robertshaw 2012-03-23 00:03:03 +00:00
parent 5937c369e6
commit 47ed75e99e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics.c
View File

@ -3758,6 +3758,7 @@ int sdl_open(void)
HWND WindowHandle; HWND WindowHandle;
HICON hIconSmall; HICON hIconSmall;
HICON hIconBig; HICON hIconBig;
#elif defined(LIN32) || defined(LIN64)
SDL_Surface *icon; SDL_Surface *icon;
#endif #endif
int status; int status;
@ -3778,7 +3779,7 @@ int sdl_open(void)
hIconBig = (HICON)LoadImage(&__ImageBase, MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED); hIconBig = (HICON)LoadImage(&__ImageBase, MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED);
SendMessage(WindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall); SendMessage(WindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
SendMessage(WindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hIconBig); SendMessage(WindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hIconBig);
#elif defined(LIN32) || defined(LIN32) #elif defined(LIN32) || defined(LIN64)
icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 64, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 64, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
SDL_WM_SetIcon(icon, NULL); SDL_WM_SetIcon(icon, NULL);
#endif #endif