From 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Mon, 19 Oct 2009 13:46:01 -0700 Subject: 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 --- crawl-ref/source/libutil.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/libutil.cc') 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 #include -#if defined(WIN32CONSOLE) || defined(WIN32TILES) +#ifdef TARGET_OS_WINDOWS #undef ARRAYSZ #include #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) { -- cgit v1.2.3-54-g00ecf