diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 13:46:01 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 14:32:50 -0700 |
| commit | 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 (patch) | |
| tree | 696a88089bf48709bece93c8b96ac7550bf090d8 /crawl-ref/source/tilesdl.cc | |
| parent | cf2b911c89d554a8f5f72156cef48b5f0fefd797 (diff) | |
| download | crawl-ref-2bbc6dd25a227a747ef6bc7f83637b57c10d9af7.tar.gz crawl-ref-2bbc6dd25a227a747ef6bc7f83637b57c10d9af7.zip | |
win32: eliminate need for WIN32TILES/WIN32CONSOLE macros
Instead of
defined(WIN32CONSOLE)
we should use:
defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
As well as replace
defined(WIN32TILES)
with:
defined(TARGET_OS_WINDOWS) && defined(USE_TILE)
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 9ff0166578..e36868d919 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -117,7 +117,7 @@ TilesFramework::~TilesFramework() static void _init_consoles() { -#ifdef WIN32TILES +#ifdef TARGET_OS_WINDOWS typedef BOOL (WINAPI *ac_func)(DWORD); ac_func attach_console = (ac_func)GetProcAddress( GetModuleHandle(TEXT("kernel32.dll")), "AttachConsole"); @@ -134,7 +134,7 @@ static void _init_consoles() static void _shutdown_console() { -#ifdef WIN32TILES +#ifdef TARGET_OS_WINDOWS typedef BOOL (WINAPI *fc_func)(void); fc_func free_console = (fc_func)GetProcAddress( GetModuleHandle(TEXT("kernel32.dll")), "FreeConsole"); @@ -227,7 +227,7 @@ void TilesFramework::calculate_default_options() bool TilesFramework::initialise() { -#ifdef WIN32TILES +#ifdef TARGET_OS_WINDOWS putenv("SDL_VIDEO_WINDOW_POS=center"); putenv("SDL_VIDEO_CENTERED=1"); #endif @@ -254,7 +254,7 @@ bool TilesFramework::initialise() #ifdef DATA_DIR_PATH DATA_DIR_PATH #endif -#ifdef WIN32TILES +#ifdef TARGET_OS_WINDOWS "dat/tiles/stone_soup_icon-win32.png"; #else "dat/tiles/stone_soup_icon-32x32.png"; |