From 68e59795393b5b26c7c61f71bb7b654d9be36220 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Sat, 24 Oct 2009 12:11:50 -0700 Subject: msvc: add x86_64 build support This updates all the contrib projects for this support as well. Signed-off-by: Steven Noonan --- crawl-ref/source/contrib/Contribs.sln | 68 +++++++++++++---------------------- 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 +- 8 files changed, 31 insertions(+), 51 deletions(-) (limited to 'crawl-ref/source/contrib') diff --git a/crawl-ref/source/contrib/Contribs.sln b/crawl-ref/source/contrib/Contribs.sln index db1ce3b094..aa548dd174 100644 --- a/crawl-ref/source/contrib/Contribs.sln +++ b/crawl-ref/source/contrib/Contribs.sln @@ -30,37 +30,30 @@ 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}.Debug|x64.ActiveCfg = Debug Multithreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug Multithreaded|x64 {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 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release Multithreaded|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release Multithreaded|x64 {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}.Debug|x64.ActiveCfg = LIB Debug|x64 + {69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.Build.0 = LIB Debug|x64 {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 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.ActiveCfg = LIB Release|x64 + {69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.Build.0 = LIB Release|x64 {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 @@ -69,59 +62,46 @@ Global {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}.Debug|x64.ActiveCfg = Debug|x64 + {A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.Build.0 = Debug|x64 {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 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.ActiveCfg = Release|x64 + {A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.Build.0 = Debug|x64 {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 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.ActiveCfg = Release|x64 + {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.Build.0 = Debug|x64 {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 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.ActiveCfg = Release|x64 + {A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = LIB Debug|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.Build.0 = LIB Debug|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 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.ActiveCfg = LIB Release|x64 + {3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.Build.0 = LIB 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 diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype index 3d6a145206..94b2625746 160000 --- a/crawl-ref/source/contrib/freetype +++ b/crawl-ref/source/contrib/freetype @@ -1 +1 @@ -Subproject commit 3d6a14520699a44a1d5c38490ffa9e3277aac240 +Subproject commit 94b26257462f63065dce6b3248958e800d9e894b diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng index d2547b434b..1a5f7d3be9 160000 --- a/crawl-ref/source/contrib/libpng +++ b/crawl-ref/source/contrib/libpng @@ -1 +1 @@ -Subproject commit d2547b434bd09ea819abed50934b465f120274ec +Subproject commit 1a5f7d3be987aa8b8d35b554f143f76e64299581 diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua index f641f8271c..9540ee4655 160000 --- a/crawl-ref/source/contrib/lua +++ b/crawl-ref/source/contrib/lua @@ -1 +1 @@ -Subproject commit f641f8271c77ff5ad311d0f536accdc571d9b32f +Subproject commit 9540ee4655ff723d7dd88d476725dff2d7ad0b42 diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre index 8e797e6e88..0ac94b7dbb 160000 --- a/crawl-ref/source/contrib/pcre +++ b/crawl-ref/source/contrib/pcre @@ -1 +1 @@ -Subproject commit 8e797e6e88e85e72bb9a030f3f46cd7aba544ffe +Subproject commit 0ac94b7dbb2835a3cf668799e56247e3fcc500f8 diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl index b59d2431e4..a99f392911 160000 --- a/crawl-ref/source/contrib/sdl +++ b/crawl-ref/source/contrib/sdl @@ -1 +1 @@ -Subproject commit b59d2431e42bb1fd124f1c3709b73704927f8624 +Subproject commit a99f392911f097a76e2b73277ae22857314a05d7 diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image index d8ee43c725..0fcc067578 160000 --- a/crawl-ref/source/contrib/sdl-image +++ b/crawl-ref/source/contrib/sdl-image @@ -1 +1 @@ -Subproject commit d8ee43c7258bde2a76d54366939932e4cb42d88e +Subproject commit 0fcc067578c37ac5f42675bfa1240d7e116f3aa8 diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite index a339a5fb22..035e853bef 160000 --- a/crawl-ref/source/contrib/sqlite +++ b/crawl-ref/source/contrib/sqlite @@ -1 +1 @@ -Subproject commit a339a5fb229898d821c618a994046cf67e6a6b4b +Subproject commit 035e853bef3cf55f509f9212dc0bdf61ba643ead -- cgit v1.2.3-54-g00ecf