msvc: add tile build support

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

5 files changed, 26 insertions, 48 deletions

diff --git a/crawl-ref/source/MSVC/Common.vsprops b/crawl-ref/source/MSVC/Common.vsprops
index a24da65f90..19345f5858 100644
--- a/crawl-ref/source/MSVC/Common.vsprops
+++ b/crawl-ref/source/MSVC/Common.vsprops
@@ -8,6 +8,7 @@
 	>

 	<Tool

 		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 		MinimalRebuild="true"

 	/>

 </VisualStudioPropertySheet>

diff --git a/crawl-ref/source/MSVC/Tiles.vsprops b/crawl-ref/source/MSVC/Tiles.vsprops
index 9fc3b2bcbf..58f6db88e2 100644
--- a/crawl-ref/source/MSVC/Tiles.vsprops
+++ b/crawl-ref/source/MSVC/Tiles.vsprops
@@ -6,12 +6,12 @@
 	>

 	<Tool

 		Name="VCCLCompilerTool"

-		AdditionalIncludeDirectories="C:\SDKs\SDL\include;C:\SDKs\SDL_image\include;C:\SDKs\libpng\include;C:\SDKs\zlib\include;C:\SDKs\freetype\include"

+		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"

 	/>

 	<Tool

 		Name="VCLinkerTool"

 		AdditionalDependencies="SDL.lib SDL_image.lib SDLmain.lib libpng.lib zlib.lib freetype.lib opengl32.lib glu32.lib"

-		AdditionalLibraryDirectories="C:\SDKs\SDL\lib;C:\SDKs\SDL_image\lib;C:\SDKs\libpng\lib;C:\SDKs\zlib\lib;C:\SDKs\freetype\lib"

+		AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\contrib\bin\8.0\$(PlatformName)&quot;"
 	/>

 </VisualStudioPropertySheet>

diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln
index 6f36d961b8..5b3feb698e 100644
--- a/crawl-ref/source/MSVC/crawl-ref.sln
+++ b/crawl-ref/source/MSVC/crawl-ref.sln
@@ -3,18 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl", "crawl.vcproj", "{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}"

 	ProjectSection(ProjectDependencies) = postProject

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0} = {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}

 		{DAE92A45-087B-445B-8E94-BA864173A73F} = {DAE92A45-087B-445B-8E94-BA864173A73F}

-		{A61349B6-4099-4688-AA1A-00D91397857D} = {A61349B6-4099-4688-AA1A-00D91397857D}

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125} = {A0FDC72E-0BE5-4542-B381-6A482DAC2125}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\contrib\lua\src\lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"
-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\contrib\sqlite\sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\contrib\pcre\pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilegen", "tilegen.vcproj", "{DAE92A45-087B-445B-8E94-BA864173A73F}"

 EndProject

 Global

@@ -33,30 +24,6 @@ Global
 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|Win32.Build.0 = Release Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.ActiveCfg = Release Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.Build.0 = Release Tiles|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Console|Win32.ActiveCfg = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Console|Win32.Build.0 = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Console|Win32.ActiveCfg = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Console|Win32.Build.0 = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Tiles|Win32.ActiveCfg = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Tiles|Win32.Build.0 = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Console|Win32.ActiveCfg = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Console|Win32.Build.0 = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Console|Win32.ActiveCfg = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Console|Win32.Build.0 = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Tiles|Win32.ActiveCfg = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Tiles|Win32.Build.0 = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Console|Win32.ActiveCfg = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Console|Win32.Build.0 = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Console|Win32.ActiveCfg = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Console|Win32.Build.0 = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Tiles|Win32.ActiveCfg = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Tiles|Win32.Build.0 = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.Build.0 = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index 0cd46d23fa..c82de4b927 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -18,8 +18,9 @@
 		<Configuration

 			Name="Debug Console|Win32"

 			OutputDirectory="$(SolutionDir)\.."

+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"

-			InheritedPropertySheets=".\Debug.vsprops;.\Console.vsprops;.\Common.vsprops"

+			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
 			CharacterSet="0"

 			WholeProgramOptimization="0"

 			>

@@ -97,7 +98,7 @@
 			Name="Release Console|Win32"

 			OutputDirectory="$(SolutionDir)\.."

 			ConfigurationType="1"

-			InheritedPropertySheets=".\Release.vsprops;.\Console.vsprops;.\Common.vsprops"

+			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
 			CharacterSet="0"

 			WholeProgramOptimization="0"

 			>

@@ -174,7 +175,7 @@
 			Name="Debug Tiles|Win32"

 			OutputDirectory="$(SolutionDir)\.."

 			ConfigurationType="1"

-			InheritedPropertySheets=".\Debug.vsprops;.\Common.vsprops;.\Tiles.vsprops"

+			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
 			CharacterSet="0"

 			WholeProgramOptimization="0"

 			>

@@ -197,7 +198,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				UsePrecompiledHeader="2"

@@ -218,9 +219,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
 				LinkIncremental="2"

 				GenerateDebugInformation="true"

-				SubSystem="1"

+				SubSystem="2"
 				TargetMachine="1"

 			/>

 			<Tool

@@ -252,7 +254,7 @@
 			Name="Release Tiles|Win32"

 			OutputDirectory="$(SolutionDir)\.."

 			ConfigurationType="1"

-			InheritedPropertySheets=".\Release.vsprops;.\Common.vsprops;.\Tiles.vsprops"

+			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
 			CharacterSet="0"

 			WholeProgramOptimization="0"

 			>

@@ -274,7 +276,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="AppHdr.h"

 				WarningLevel="3"

@@ -293,9 +295,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
 				LinkIncremental="1"

+				AdditionalLibraryDirectories="$(ProjectDir)\..\contrib\bin\8.0"
 				GenerateDebugInformation="true"

-				SubSystem="1"

+				SubSystem="2"
 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				TargetMachine="1"

diff --git a/crawl-ref/source/MSVC/tilegen.vcproj b/crawl-ref/source/MSVC/tilegen.vcproj
index 1a7e979d01..aec998c047 100644
--- a/crawl-ref/source/MSVC/tilegen.vcproj
+++ b/crawl-ref/source/MSVC/tilegen.vcproj
@@ -17,6 +17,7 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

+			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"

 			InheritedPropertySheets=".\Common.vsprops;.\Tiles.vsprops;.\Debug.vsprops"

 			CharacterSet="1"

@@ -39,13 +40,12 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\contrib\sdl\include;$(SolutionDir)\..\contrib\sdl-image;$(SolutionDir)\..\contrib\libpng;$(SolutionDir)\..\contrib\zlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -58,7 +58,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
 				LinkIncremental="2"

+				AdditionalLibraryDirectories="$(ProjectDir)\..\contrib\bin\8.0"
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -86,11 +88,13 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\"

+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\&#x0D;&#x0A;"
 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

+			OutputDirectory="$(SolutionDir)\.."
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"

 			InheritedPropertySheets=".\Common.vsprops;.\Tiles.vsprops;.\Release.vsprops"

 			CharacterSet="1"

@@ -113,10 +117,10 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\contrib\sdl\include;$(SolutionDir)\..\contrib\sdl-image;$(SolutionDir)\..\contrib\libpng;$(SolutionDir)\..\contrib\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -130,7 +134,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
 				LinkIncremental="1"

+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\contrib\bin\8.0\$(PlatformName)&quot;"
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -160,7 +166,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\"

+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\&#x0D;&#x0A;"
 			/>

 		</Configuration>

 	</Configurations>