From 2ae01123576c82be94c1e593b76b1660d571c8b4 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Thu, 15 Oct 2009 15:38:10 -0700 Subject: msvc: add tile build support Signed-off-by: Steven Noonan --- crawl-ref/source/MSVC/Common.vsprops | 1 + crawl-ref/source/MSVC/Tiles.vsprops | 4 ++-- crawl-ref/source/MSVC/crawl-ref.sln | 33 --------------------------------- crawl-ref/source/MSVC/crawl.vcproj | 20 ++++++++++++-------- crawl-ref/source/MSVC/tilegen.vcproj | 16 +++++++++++----- 5 files changed, 26 insertions(+), 48 deletions(-) (limited to 'crawl-ref/source/MSVC') 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 @@ > 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 @@ > 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 @@ @@ -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 @@ /> @@ -274,7 +276,7 @@ -- cgit v1.2.3-54-g00ecf