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/libutil.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/libutil.cc')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 7be6d37930..a73bc7276d 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -18,7 +18,7 @@ #include <stdarg.h> #include <string.h> -#if defined(WIN32CONSOLE) || defined(WIN32TILES) +#ifdef TARGET_OS_WINDOWS #undef ARRAYSZ #include <windows.h> #undef max @@ -30,7 +30,7 @@ #ifdef REGEX_PCRE // Statically link pcre on Windows - #if defined(WIN32CONSOLE) || defined(WIN32TILES) || defined(TARGET_OS_DOS) + #if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) #define PCRE_STATIC #endif @@ -161,7 +161,7 @@ std::string &escape_path_spaces(std::string &s) } result += *ch; } -#elif defined(WIN32CONSOLE) || defined(WIN32TILES) +#elif defined(TARGET_OS_WINDOWS) if (s.find(" ") != std::string::npos && s.find("\"") == std::string::npos) { |