From 7cdde3546869b247b52006454c5f0fbac32d4bac Mon Sep 17 00:00:00 2001 From: codereader Date: Mon, 11 Oct 2021 12:26:40 +0200 Subject: [PATCH] #5778: Move solution file to root folder. Fix a few paths, add new property sheet for static libraries. --- tools/msvc/DarkRadiant.sln => DarkRadiant.sln | 42 +++++++++---------- tools/msvc/mathlib.vcxproj | 12 ++---- tools/msvc/properties/DarkRadiant Base.props | 6 +-- .../properties/DarkRadiant Core Library.props | 2 +- .../properties/DarkRadiant Plugin DLL.props | 2 +- .../DarkRadiant Static Library.props | 10 +++++ 6 files changed, 40 insertions(+), 34 deletions(-) rename tools/msvc/DarkRadiant.sln => DarkRadiant.sln (91%) create mode 100644 tools/msvc/properties/DarkRadiant Static Library.props diff --git a/tools/msvc/DarkRadiant.sln b/DarkRadiant.sln similarity index 91% rename from tools/msvc/DarkRadiant.sln rename to DarkRadiant.sln index bd80e13119..4a06b3ff9e 100644 --- a/tools/msvc/DarkRadiant.sln +++ b/DarkRadiant.sln @@ -2,81 +2,81 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "mathlib.vcxproj", "{3C9FB5AA-7118-476E-B33D-D3AC1C8412BB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "tools\msvc\mathlib.vcxproj", "{3C9FB5AA-7118-476E-B33D-D3AC1C8412BB}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiant", "DarkRadiant.vcxproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiant", "tools\msvc\DarkRadiant.vcxproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlutillib", "xmlutillib.vcxproj", "{A15EFB56-927F-411D-A57B-0328321456A2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlutillib", "tools\msvc\xmlutillib.vcxproj", "{A15EFB56-927F-411D-A57B-0328321456A2}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutillib", "wxutillib.vcxproj", "{B6D4B38A-0C39-42CD-8193-75979E1F4D68}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound.vcxproj", "{1482AAB4-40B6-44C0-9FD8-AF80C18A5E7F}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.stimresponse", "dm.stimresponse.vcxproj", "{EE9A3B61-58E0-4AA4-8942-6CFCBFAACC3F}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.objectives", "dm.objectives.vcxproj", "{05E9A613-2108-4843-A567-16B432DAC272}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.difficulty", "dm.difficulty.vcxproj", "{68B95079-09DF-48F7-BAD9-81C33118BEFD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.difficulty", "tools\msvc\dm.difficulty.vcxproj", "{68B95079-09DF-48F7-BAD9-81C33118BEFD}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scenelib", "scenelib.vcxproj", "{F7408B46-E4A9-470C-9731-9A1564247385}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scenelib", "tools\msvc\scenelib.vcxproj", "{F7408B46-E4A9-470C-9731-9A1564247385}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "include.vcxproj", "{41CAAD78-9E48-4C6E-B8F8-A04A859C16F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "tools\msvc\include.vcxproj", "{41CAAD78-9E48-4C6E-B8F8-A04A859C16F9}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.conversation", "dm.conversation.vcxproj", "{435F29EA-7236-49AD-BF1A-5DB8AD566B5D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.conversation", "tools\msvc\dm.conversation.vcxproj", "{435F29EA-7236-49AD-BF1A-5DB8AD566B5D}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "script", "script.vcxproj", "{979A38FE-BE30-4121-845C-B705461BB1B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "script", "tools\msvc\script.vcxproj", "{979A38FE-BE30-4121-845C-B705461BB1B0}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.editing", "dm.editing.vcxproj", "{3552912C-32C9-4D59-9E65-357AD147A1FC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.editing", "tools\msvc\dm.editing.vcxproj", "{3552912C-32C9-4D59-9E65-357AD147A1FC}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.gui", "dm.gui.vcxproj", "{586DBC32-C9D4-4720-B246-1E3D7D8C02B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.gui", "tools\msvc\dm.gui.vcxproj", "{586DBC32-C9D4-4720-B246-1E3D7D8C02B3}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "libs.vcxproj", "{5EB15BCF-2131-4DE3-B411-FC0D2DEF702F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "tools\msvc\libs.vcxproj", "{5EB15BCF-2131-4DE3-B411-FC0D2DEF702F}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection @@ -87,7 +87,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3C3C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main Binary and Headers", "Main Binary and Headers", "{F0E8C46B-4F20-43B1-9A8D-13A9D0A3BA3D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiantCore", "DarkRadiantCore.vcxproj", "{83D79C71-4E8F-4F78-9D46-EF02D5D5CD89}" +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} @@ -96,27 +96,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiantCore", "DarkRadi {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} = {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "modulelib.vcxproj", "{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "tools\msvc\modulelib.vcxproj", "{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}" ProjectSection(ProjectDependencies) = postProject {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxproj", "{20C43725-BD6F-4E90-8D8C-5AB2AFFBF957}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.gameconnection", "dm.gameconnection.vcxproj", "{471AEAFE-68CE-4010-9B8F-3CB95810BEA5}" +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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DependencyCheck", "..\DependencyCheck\DependencyCheck.vcxproj", "{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DependencyCheck", "tools\DependencyCheck\DependencyCheck.vcxproj", "{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcs", "vcs.vcxproj", "{6591C1E2-6BCF-4874-B724-CC87B8AA0DA4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcs", "tools\msvc\vcs.vcxproj", "{6591C1E2-6BCF-4874-B724-CC87B8AA0DA4}" ProjectSection(ProjectDependencies) = postProject {A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2} {B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68} diff --git a/tools/msvc/mathlib.vcxproj b/tools/msvc/mathlib.vcxproj index 6bddaa6c4c..32a271aa9a 100644 --- a/tools/msvc/mathlib.vcxproj +++ b/tools/msvc/mathlib.vcxproj @@ -45,30 +45,26 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)\..\..\build\libs\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\libs\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\libs\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\$(ProjectName)\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\libs\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\..\build\$(ProjectName)\$(Platform)\$(Configuration)\ AllRules.ruleset diff --git a/tools/msvc/properties/DarkRadiant Base.props b/tools/msvc/properties/DarkRadiant Base.props index 5428bdd55f..fb378d4641 100644 --- a/tools/msvc/properties/DarkRadiant Base.props +++ b/tools/msvc/properties/DarkRadiant Base.props @@ -2,12 +2,12 @@ - $(SolutionDir)..\.. + $(SolutionDir) $(DarkRadiantRoot)\w32deps\ $(DarkRadiantRoot)\w64deps\ - $(SolutionDir)\..\..\build\$(ProjectName)\$(Platform)\$(Configuration)\ + $(DarkRadiantRoot)build\$(ProjectName)\$(Platform)\$(Configuration)\ false @@ -33,7 +33,7 @@ true - $(SolutionDir)\..\..\build\libs\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + $(DarkRadiantRoot)build\libs\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) diff --git a/tools/msvc/properties/DarkRadiant Core Library.props b/tools/msvc/properties/DarkRadiant Core Library.props index af96fae0a5..9f1aa9b6b4 100644 --- a/tools/msvc/properties/DarkRadiant Core Library.props +++ b/tools/msvc/properties/DarkRadiant Core Library.props @@ -3,7 +3,7 @@ - $(SolutionDir)\..\..\install\ + $(DarkRadiantRoot)install\ diff --git a/tools/msvc/properties/DarkRadiant Plugin DLL.props b/tools/msvc/properties/DarkRadiant Plugin DLL.props index 255d84d37f..bd04ceecbf 100644 --- a/tools/msvc/properties/DarkRadiant Plugin DLL.props +++ b/tools/msvc/properties/DarkRadiant Plugin DLL.props @@ -3,7 +3,7 @@ - $(SolutionDir)\..\..\install\plugins\ + $(DarkRadiantRoot)install\plugins\ diff --git a/tools/msvc/properties/DarkRadiant Static Library.props b/tools/msvc/properties/DarkRadiant Static Library.props new file mode 100644 index 0000000000..1d67d04501 --- /dev/null +++ b/tools/msvc/properties/DarkRadiant Static Library.props @@ -0,0 +1,10 @@ + + + + + + $(DarkRadiantRoot)build\libs\$(Platform)\$(Configuration)\ + + + + \ No newline at end of file