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/cio.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/cio.cc')
| -rw-r--r-- | crawl-ref/source/cio.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc index 9a455a77ac..8f4fb155e9 100644 --- a/crawl-ref/source/cio.cc +++ b/crawl-ref/source/cio.cc @@ -150,7 +150,7 @@ void get_input_line( char *const buff, int len ) get_input_line_gui( buff, len ); #elif defined(UNIX) get_input_line_from_curses( buff, len ); // implemented in libunix.cc -#elif defined(WIN32CONSOLE) +#elif defined(TARGET_OS_WINDOWS) getstr( buff, len ); #else @@ -185,7 +185,7 @@ void get_input_line( char *const buff, int len ) // we want to use in cancelable_get_line() and menus. int c_getch() { -#if defined(TARGET_OS_DOS) || defined(UNIX) || defined(WIN32CONSOLE) +#if defined(TARGET_OS_DOS) || defined(UNIX) || (defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)) return getch_ck(); #else return m_getch(); |