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/contrib/.gitignore | 4 + crawl-ref/source/contrib/Common.vsprops | 26 ++++++ crawl-ref/source/contrib/Contribs.sln | 133 +++++++++++++++++++++++++++++++ crawl-ref/source/contrib/DLL.vsprops | 16 ++++ crawl-ref/source/contrib/Debug.vsprops | 12 +++ crawl-ref/source/contrib/LIB.vsprops | 11 +++ crawl-ref/source/contrib/Release.vsprops | 21 +++++ crawl-ref/source/contrib/freetype | 2 +- crawl-ref/source/contrib/libpng | 2 +- crawl-ref/source/contrib/lua | 2 +- crawl-ref/source/contrib/pcre | 2 +- crawl-ref/source/contrib/sdl | 2 +- crawl-ref/source/contrib/sdl-image | 2 +- crawl-ref/source/contrib/sqlite | 2 +- crawl-ref/source/contrib/zlib | 1 + 15 files changed, 231 insertions(+), 7 deletions(-) create mode 100644 crawl-ref/source/contrib/Common.vsprops create mode 100644 crawl-ref/source/contrib/Contribs.sln create mode 100644 crawl-ref/source/contrib/DLL.vsprops create mode 100644 crawl-ref/source/contrib/Debug.vsprops create mode 100644 crawl-ref/source/contrib/LIB.vsprops create mode 100644 crawl-ref/source/contrib/Release.vsprops create mode 160000 crawl-ref/source/contrib/zlib (limited to 'crawl-ref/source/contrib') diff --git a/crawl-ref/source/contrib/.gitignore b/crawl-ref/source/contrib/.gitignore index 849627de30..4457c4298a 100644 --- a/crawl-ref/source/contrib/.gitignore +++ b/crawl-ref/source/contrib/.gitignore @@ -1,2 +1,6 @@ # Xcode build outputs Frameworks + +# Visual C++ outputs +bin +obj diff --git a/crawl-ref/source/contrib/Common.vsprops b/crawl-ref/source/contrib/Common.vsprops new file mode 100644 index 0000000000..3c63883009 --- /dev/null +++ b/crawl-ref/source/contrib/Common.vsprops @@ -0,0 +1,26 @@ + + + + + diff --git a/crawl-ref/source/contrib/Contribs.sln b/crawl-ref/source/contrib/Contribs.sln new file mode 100644 index 0000000000..7aba8fd4d7 --- /dev/null +++ b/crawl-ref/source/contrib/Contribs.sln @@ -0,0 +1,133 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\projects\visualc8\libpng.vcproj", "{69C22A64-61EF-4206-816C-6D36766652A6}" + ProjectSection(ProjectDependencies) = postProject + {3D9F174B-2909-4834-A3D7-892E8D442A5D} = {3D9F174B-2909-4834-A3D7-892E8D442A5D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "sdl\VisualC\SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "sdl-image\VisualC\SDL_image.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}" + ProjectSection(ProjectDependencies) = postProject + {69C22A64-61EF-4206-816C-6D36766652A6} = {69C22A64-61EF-4206-816C-6D36766652A6} + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\src\lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite\sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre\pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\projects\visualc2005\zlib.vcproj", "{3D9F174B-2909-4834-A3D7-892E8D442A5D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "sdl\VisualC\SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32 + Release_NoSTDIO|x64 = Release_NoSTDIO|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|Win32.ActiveCfg = Release Singlethreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|Win32.Build.0 = Release Singlethreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|x64.ActiveCfg = Release Singlethreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release Multithreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Debug|Win32.ActiveCfg = LIB ASM Debug|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Debug|Win32.Build.0 = LIB ASM Debug|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.ActiveCfg = DLL VB|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|Win32.ActiveCfg = LIB ASM Debug|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|Win32.Build.0 = LIB ASM Debug|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|x64.ActiveCfg = LIB ASM Debug|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release|Win32.ActiveCfg = LIB ASM Release|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release|Win32.Build.0 = LIB ASM Release|Win32 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.ActiveCfg = LIB ASM Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.ActiveCfg = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.Build.0 = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|Win32.ActiveCfg = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|x64.ActiveCfg = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|x64.Build.0 = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.ActiveCfg = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.Build.0 = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64 + {A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.ActiveCfg = Debug|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.Build.0 = Debug|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.ActiveCfg = Debug|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.ActiveCfg = Release|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.Build.0 = Release|Win32 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.ActiveCfg = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.Build.0 = Debug|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.ActiveCfg = Debug|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.ActiveCfg = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.Build.0 = Release|Win32 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.ActiveCfg = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.ActiveCfg = Debug|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.Build.0 = Debug|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.ActiveCfg = Debug|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.ActiveCfg = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.Build.0 = Release|Win32 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.ActiveCfg = Release|Win32 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|Win32.ActiveCfg = LIB ASM Debug|Win32 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|Win32.Build.0 = LIB ASM Debug|Win32 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.ActiveCfg = DLL Debug|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.Build.0 = DLL Debug|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|Win32.ActiveCfg = LIB ASM Release|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|x64.ActiveCfg = LIB ASM Release|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|x64.Build.0 = LIB ASM Release|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|Win32.ActiveCfg = LIB ASM Release|Win32 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|Win32.Build.0 = LIB ASM Release|Win32 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.ActiveCfg = LIB ASM Release|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.Build.0 = LIB ASM Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/crawl-ref/source/contrib/DLL.vsprops b/crawl-ref/source/contrib/DLL.vsprops new file mode 100644 index 0000000000..d3fcb96538 --- /dev/null +++ b/crawl-ref/source/contrib/DLL.vsprops @@ -0,0 +1,16 @@ + + + + + diff --git a/crawl-ref/source/contrib/Debug.vsprops b/crawl-ref/source/contrib/Debug.vsprops new file mode 100644 index 0000000000..6a0b290a64 --- /dev/null +++ b/crawl-ref/source/contrib/Debug.vsprops @@ -0,0 +1,12 @@ + + + + diff --git a/crawl-ref/source/contrib/LIB.vsprops b/crawl-ref/source/contrib/LIB.vsprops new file mode 100644 index 0000000000..87280d5b6a --- /dev/null +++ b/crawl-ref/source/contrib/LIB.vsprops @@ -0,0 +1,11 @@ + + + + diff --git a/crawl-ref/source/contrib/Release.vsprops b/crawl-ref/source/contrib/Release.vsprops new file mode 100644 index 0000000000..701167bc22 --- /dev/null +++ b/crawl-ref/source/contrib/Release.vsprops @@ -0,0 +1,21 @@ + + + + + diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype index dcd353e633..3d6a145206 160000 --- a/crawl-ref/source/contrib/freetype +++ b/crawl-ref/source/contrib/freetype @@ -1 +1 @@ -Subproject commit dcd353e633d79b188b854316c1fbc7b722ad39c8 +Subproject commit 3d6a14520699a44a1d5c38490ffa9e3277aac240 diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng index c970ebf5d3..d2547b434b 160000 --- a/crawl-ref/source/contrib/libpng +++ b/crawl-ref/source/contrib/libpng @@ -1 +1 @@ -Subproject commit c970ebf5d332c3ac60870266955f74f1ede83830 +Subproject commit d2547b434bd09ea819abed50934b465f120274ec diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua index 3b31c62dae..3a5124b6a7 160000 --- a/crawl-ref/source/contrib/lua +++ b/crawl-ref/source/contrib/lua @@ -1 +1 @@ -Subproject commit 3b31c62dae61689d5acf66d0a7a7a138bc8e4c99 +Subproject commit 3a5124b6a7630ba5bb0226a20ae61561b06a7b04 diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre index 5aac4d787b..c530f39e65 160000 --- a/crawl-ref/source/contrib/pcre +++ b/crawl-ref/source/contrib/pcre @@ -1 +1 @@ -Subproject commit 5aac4d787bbed8607a326386a8a943f2ca6c0b74 +Subproject commit c530f39e65b1cb4a9a18b4557a1ec46e1a78a816 diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl index 2166d861a3..b17c2c1348 160000 --- a/crawl-ref/source/contrib/sdl +++ b/crawl-ref/source/contrib/sdl @@ -1 +1 @@ -Subproject commit 2166d861a3287daa554b51477b549c4761d46995 +Subproject commit b17c2c134808ee14e3bf65e886011ce97751848d diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image index 6ecfa91b8f..98d5c63aa3 160000 --- a/crawl-ref/source/contrib/sdl-image +++ b/crawl-ref/source/contrib/sdl-image @@ -1 +1 @@ -Subproject commit 6ecfa91b8fbfc0583c99a4338d600da373bfe6fb +Subproject commit 98d5c63aa3178c1704663000b57b8f1f31360f9c diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite index 702864caab..6316c9fe38 160000 --- a/crawl-ref/source/contrib/sqlite +++ b/crawl-ref/source/contrib/sqlite @@ -1 +1 @@ -Subproject commit 702864caabf71939b3747d6f9aba6a67fb4f5017 +Subproject commit 6316c9fe38d295b36773db1bfcb2e7c8971cbe08 diff --git a/crawl-ref/source/contrib/zlib b/crawl-ref/source/contrib/zlib new file mode 160000 index 0000000000..e8eae3783f --- /dev/null +++ b/crawl-ref/source/contrib/zlib @@ -0,0 +1 @@ +Subproject commit e8eae3783f019b8ebb7dcca47e61da41dbcae1b5 -- cgit v1.2.3-54-g00ecf