diff options
| author | ntoskrnl <ntoskrnl11@yahoo.com> | 2012-07-29 15:55:26 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-02 14:20:14 (GMT) |
| commit | 87dfc47c9785f834e61eef4545c503071d1665fc (patch) | |
| tree | 558c8c24c064a6f24cb5ee1fa0ab38e81e2aaadb /src/PowderToySDL.cpp | |
| parent | cbefea85d717bd599fa0559f091b051e904d9e2f (diff) | |
| download | powder-87dfc47c9785f834e61eef4545c503071d1665fc.zip powder-87dfc47c9785f834e61eef4545c503071d1665fc.tar.gz | |
Separate operating system and architecture preprocessor definitions
Conflicts:
SConscript
Diffstat (limited to 'src/PowderToySDL.cpp')
| -rw-r--r-- | src/PowderToySDL.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index abfaaac..f9901c1 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -12,7 +12,7 @@ #include <string> #include "Config.h" #include "graphics/Graphics.h" -#if defined(LIN32) || defined(LIN64) +#if defined(LIN) #include "icon.h" #endif @@ -105,7 +105,7 @@ SDL_Surface * SDLOpen() HICON hIconBig = (HICON)LoadImage(reinterpret_cast<HMODULE>(&__ImageBase), MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED); SendMessage(WindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall); SendMessage(WindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hIconBig); -#elif defined(LIN32) || defined(LIN32) +#elif defined(LIN) SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 64, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); SDL_WM_SetIcon(icon, NULL); #endif |