From 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
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 <steven@uplinklabs.net>
---
 crawl-ref/source/MSVC/Console.vsprops | 2 +-
 crawl-ref/source/MSVC/Tiles.vsprops   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crawl-ref/source/MSVC')

diff --git a/crawl-ref/source/MSVC/Console.vsprops b/crawl-ref/source/MSVC/Console.vsprops
index 9937955be8..213cfb9f73 100644
--- a/crawl-ref/source/MSVC/Console.vsprops
+++ b/crawl-ref/source/MSVC/Console.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="WIN32CONSOLE"
+		PreprocessorDefinitions=""
 	/>
 </VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/Tiles.vsprops b/crawl-ref/source/MSVC/Tiles.vsprops
index 58f6db88e2..6ace6166ef 100644
--- a/crawl-ref/source/MSVC/Tiles.vsprops
+++ b/crawl-ref/source/MSVC/Tiles.vsprops
@@ -7,7 +7,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\contrib\sdl\include&quot;;&quot;$(SolutionDir)\..\contrib\sdl-image&quot;;&quot;$(SolutionDir)\..\contrib\libpng&quot;;&quot;$(SolutionDir)\..\contrib\freetype\include&quot;;&quot;$(SolutionDir)\..\contrib\zlib&quot;"
-		PreprocessorDefinitions="WIN32TILES;USE_TILE"
+		PreprocessorDefinitions="USE_TILE"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-- 
cgit v1.2.3-54-g00ecf