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/stuff.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/stuff.cc')
| -rw-r--r-- | crawl-ref/source/stuff.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index afb69d56aa..1654202916 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -749,7 +749,7 @@ void cio_init() unixcurses_startup(); #endif -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) init_libw32c(); #endif @@ -782,7 +782,7 @@ void cio_cleanup() unixcurses_shutdown(); #endif -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) deinit_libw32c(); #endif @@ -826,7 +826,9 @@ void end(int exit_code, bool print_error, const char *format, ...) error.clear(); } -#if defined(WIN32CONSOLE) || defined(TARGET_OS_DOS) || defined(DGL_PAUSE_AFTER_ERROR) +#if (defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)) || \ + defined(TARGET_OS_DOS) || \ + defined(DGL_PAUSE_AFTER_ERROR) if (exit_code && !crawl_state.arena && !crawl_state.seen_hups && !crawl_state.test) { |