From 9dd323343166105f93a6198222ed3934f5deb49b Mon Sep 17 00:00:00 2001 From: codereader Date: Tue, 23 Jul 2024 13:06:13 +0200 Subject: [PATCH] Project updates and compilation fixes --- DarkRadiant.sln | 29 ++--- include/ishaderlayer.h | 4 + test/Skin.cpp | 8 +- tools/msvc/DarkRadiant.vcxproj | 1 - tools/msvc/DarkRadiant.vcxproj.filters | 3 - tools/msvc/DarkRadiantCore.vcxproj | 40 ------ tools/msvc/DarkRadiantCore.vcxproj.filters | 123 ------------------- tools/msvc/scenelib.vcxproj | 46 +++++++ tools/msvc/scenelib.vcxproj.filters | 134 +++++++++++++++++++++ tools/msvc/wxutillib.vcxproj | 9 +- tools/msvc/wxutillib.vcxproj.filters | 1 + 11 files changed, 209 insertions(+), 189 deletions(-) diff --git a/DarkRadiant.sln b/DarkRadiant.sln index 818a748c51..58d9677adf 100644 --- a/DarkRadiant.sln +++ b/DarkRadiant.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiant", "tools\msvc\DarkRadiant.vcxproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}" ProjectSection(ProjectDependencies) = postProject @@ -19,26 +19,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlutillib", "tools\msvc\xm EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutillib", "tools\msvc\wxutillib.vcxproj", "{B6D4B38A-0C39-42CD-8193-75979E1F4D68}" ProjectSection(ProjectDependencies) = postProject - {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} = {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} + {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "tools\msvc\sound.vcxproj", "{1482AAB4-40B6-44C0-9FD8-AF80C18A5E7F}" ProjectSection(ProjectDependencies) = postProject - {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.stimresponse", "tools\msvc\dm.stimresponse.vcxproj", "{EE9A3B61-58E0-4AA4-8942-6CFCBFAACC3F}" ProjectSection(ProjectDependencies) = postProject - {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.objectives", "tools\msvc\dm.objectives.vcxproj", "{05E9A613-2108-4843-A567-16B432DAC272}" ProjectSection(ProjectDependencies) = postProject - {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.difficulty", "tools\msvc\dm.difficulty.vcxproj", "{68B95079-09DF-48F7-BAD9-81C33118BEFD}" @@ -59,8 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "tools\msvc\inclu EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.conversation", "tools\msvc\dm.conversation.vcxproj", "{435F29EA-7236-49AD-BF1A-5DB8AD566B5D}" ProjectSection(ProjectDependencies) = postProject - {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "script", "tools\msvc\script.vcxproj", "{979A38FE-BE30-4121-845C-B705461BB1B0}" @@ -91,11 +92,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main Binary and Headers", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiantCore", "tools\msvc\DarkRadiantCore.vcxproj", "{83D79C71-4E8F-4F78-9D46-EF02D5D5CD89}" ProjectSection(ProjectDependencies) = postProject - {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} = {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} - {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} - {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} = {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} + {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} = {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} + {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} + {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "tools\msvc\modulelib.vcxproj", "{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}" @@ -105,24 +106,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "tools\msvc\mod EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "tools\msvc\Tests\Tests.vcxproj", "{20C43725-BD6F-4E90-8D8C-5AB2AFFBF957}" ProjectSection(ProjectDependencies) = postProject - {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} = {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} = {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.gameconnection", "tools\msvc\dm.gameconnection.vcxproj", "{471AEAFE-68CE-4010-9B8F-3CB95810BEA5}" ProjectSection(ProjectDependencies) = postProject - {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} - {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} + {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} + {F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DependencyCheck", "tools\DependencyCheck\DependencyCheck.vcxproj", "{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcs", "tools\msvc\vcs.vcxproj", "{6591C1E2-6BCF-4874-B724-CC87B8AA0DA4}" ProjectSection(ProjectDependencies) = postProject + {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} - {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject Global diff --git a/include/ishaderlayer.h b/include/ishaderlayer.h index 05d59f4f46..5b699d5e3c 100644 --- a/include/ishaderlayer.h +++ b/include/ishaderlayer.h @@ -479,6 +479,8 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::VertexColourMod return os << "vertexColor"; case IShaderLayer::VERTEX_COLOUR_INVERSE_MULTIPLY: return os << "inverseVertexColor"; + default: + return os; } } @@ -493,6 +495,8 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::Type type) return os << "specularmap"; case IShaderLayer::BLEND: return os << "blend"; + default: + return os; } } diff --git a/test/Skin.cpp b/test/Skin.cpp index fb831d93b3..d247371284 100644 --- a/test/Skin.cpp +++ b/test/Skin.cpp @@ -692,7 +692,7 @@ void expectModelDefHasMeshAndSkin(const std::string& modelDef, const std::string EXPECT_EQ(model->getSkin(), expectedSkin) << "Expected skin to be " << expectedSkin << " on modelDef " << modelDef; } -IEntityNodePtr createStaticEntityWithModel(const std::string& model) +EntityNodePtr createStaticEntityWithModel(const std::string& model) { auto funcStaticClass = GlobalEntityClassManager().findClass("func_static"); auto entity = GlobalEntityModule().createEntity(funcStaticClass); @@ -700,7 +700,7 @@ IEntityNodePtr createStaticEntityWithModel(const std::string& model) return entity; } -SkinnedModel::Ptr getSkinnedModel(const IEntityNodePtr& entity) +SkinnedModel::Ptr getSkinnedModel(const EntityNodePtr& entity) { SkinnedModel::Ptr foundModelNode; @@ -719,7 +719,7 @@ SkinnedModel::Ptr getSkinnedModel(const IEntityNodePtr& entity) return foundModelNode; } -void expectEntityHasSkinnedModel(const IEntityNodePtr& entity, const std::string& expectedSkin, const std::vector& expectedMaterials) +void expectEntityHasSkinnedModel(const EntityNodePtr& entity, const std::string& expectedSkin, const std::vector& expectedMaterials) { // Check the skinned model node beneath it auto foundModelNode = getSkinnedModel(entity); @@ -746,7 +746,7 @@ void expectEntityClassHasSkinnedModel(const std::string& eclassName, const std:: expectEntityHasSkinnedModel(entity, expectedSkin, expectedMaterials); } -void setSkinKeyAndCheckModel(const IEntityNodePtr& entity, const std::string& expectedSkin, const std::vector& expectedMaterials) +void setSkinKeyAndCheckModel(const EntityNodePtr& entity, const std::string& expectedSkin, const std::vector& expectedMaterials) { // Save the data to do a before/after test auto model = getSkinnedModel(entity); diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj index 60d61e878c..bb795258ab 100644 --- a/tools/msvc/DarkRadiant.vcxproj +++ b/tools/msvc/DarkRadiant.vcxproj @@ -578,7 +578,6 @@ - diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters index 28be2aa6f9..6300b5d218 100644 --- a/tools/msvc/DarkRadiant.vcxproj.filters +++ b/tools/msvc/DarkRadiant.vcxproj.filters @@ -1443,9 +1443,6 @@ src\ui\skin - - src\ui\skin - src\xyview diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj index 7a76766557..1a71f4cf66 100644 --- a/tools/msvc/DarkRadiantCore.vcxproj +++ b/tools/msvc/DarkRadiantCore.vcxproj @@ -45,7 +45,6 @@ - @@ -53,30 +52,15 @@ - - - - - - - - - - - - - - - @@ -776,8 +760,6 @@ - - @@ -789,40 +771,18 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters index 7ed41cbcbc..3a5952b80d 100644 --- a/tools/msvc/DarkRadiantCore.vcxproj.filters +++ b/tools/msvc/DarkRadiantCore.vcxproj.filters @@ -95,9 +95,6 @@ {70f1fe8d-f960-4a79-b820-aca0e194b730} - - {c631249d-5618-4429-bc52-7bf108cc13b7} - {9e9f3eed-43d3-462c-8219-68860002cc87} @@ -397,36 +394,12 @@ src\entity - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - src\entity src\entity - - src\entity - src\entity\light @@ -454,21 +427,6 @@ src\entity\eclassmodel - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - src\entity\speaker @@ -991,12 +949,6 @@ src\decl - - src\entity - - - src\entity - src\eclass @@ -1099,9 +1051,6 @@ src\brush - - src\entity - src\rendersystem\backend @@ -1449,54 +1398,15 @@ src\entity - - src\entity - src\entity - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - - - src\entity - src\entity src\entity - - src\entity - src\entity @@ -1539,27 +1449,6 @@ src\entity\eclassmodel - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - - - src\entity\target - src\entity\speaker @@ -2163,12 +2052,6 @@ src\entity\algorithm - - src\entity - - - src\entity - src\eclass @@ -2313,9 +2196,6 @@ src\rendersystem\backend - - src\entity - src\rendersystem\backend @@ -2325,9 +2205,6 @@ src\rendersystem - - src\entity - src\rendersystem\backend diff --git a/tools/msvc/scenelib.vcxproj b/tools/msvc/scenelib.vcxproj index 2255500985..74490ec544 100644 --- a/tools/msvc/scenelib.vcxproj +++ b/tools/msvc/scenelib.vcxproj @@ -110,8 +110,14 @@ + + + + + + @@ -119,22 +125,43 @@ + + + + + + + + + + + + + + + + + + + + + @@ -154,18 +181,37 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tools/msvc/scenelib.vcxproj.filters b/tools/msvc/scenelib.vcxproj.filters index 5fc9305d82..2b88bbca73 100644 --- a/tools/msvc/scenelib.vcxproj.filters +++ b/tools/msvc/scenelib.vcxproj.filters @@ -51,6 +51,57 @@ scene\merge + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + @@ -166,5 +217,88 @@ scene + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + scene + + + + + scene + \ No newline at end of file diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj index 0431aaa280..630d2bbaae 100644 --- a/tools/msvc/wxutillib.vcxproj +++ b/tools/msvc/wxutillib.vcxproj @@ -100,7 +100,7 @@ - scenelib.lib;%(AdditionalDependencies) + scenelib.lib;mathlib.lib;%(AdditionalDependencies) @@ -110,14 +110,14 @@ - scenelib.lib;%(AdditionalDependencies) + scenelib.lib;mathlib.lib;%(AdditionalDependencies) - scenelib.lib;%(AdditionalDependencies) + scenelib.lib;mathlib.lib;%(AdditionalDependencies) @@ -127,7 +127,7 @@ - scenelib.lib;%(AdditionalDependencies) + scenelib.lib;mathlib.lib;%(AdditionalDependencies) @@ -149,6 +149,7 @@ + diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters index c73f5402c5..b53c3faa43 100644 --- a/tools/msvc/wxutillib.vcxproj.filters +++ b/tools/msvc/wxutillib.vcxproj.filters @@ -189,6 +189,7 @@ preview +