From 43150c181a25514067cf95c440920e35c75d47b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Mon, 21 Apr 2025 23:27:48 +0300 Subject: [PATCH 1/4] Add a new target to copy relevant data and build g2.dat if needed --- openrct2.sln | 33 ++++- src/openrct2-data/openrct2-data.vcxproj | 170 ++++++++++++++++++++++++ 2 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 src/openrct2-data/openrct2-data.vcxproj diff --git a/openrct2.sln b/openrct2.sln index 5556485514..147f82a2ba 100644 --- a/openrct2.sln +++ b/openrct2.sln @@ -7,16 +7,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenrct2", "src\openrct2 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-win", "src\openrct2-win\openrct2-win.vcxproj", "{7A9A57D5-7006-4208-A290-5491BA3C8808}" ProjectSection(ProjectDependencies) = postProject - {B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842} {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} + {B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842} {D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "test\tests\tests.vcxproj", "{62B020FA-E4FB-4C6E-B32A-DC999470F155}" ProjectSection(ProjectDependencies) = postProject - {B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842} - {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} {7A9A57D5-7006-4208-A290-5491BA3C8808} = {7A9A57D5-7006-4208-A290-5491BA3C8808} + {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} + {B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842} {D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F} EndProjectSection EndProject @@ -31,6 +31,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-cli", "src\openrct {D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-data", "src\openrct2-data\openrct2-data.vcxproj", "{70EEED2D-2344-4F28-87B7-3EFC4E78B923}" + ProjectSection(ProjectDependencies) = postProject + {7A9A57D5-7006-4208-A290-5491BA3C8808} = {7A9A57D5-7006-4208-A290-5491BA3C8808} + {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} + {B6808F71-30B4-4499-8FF6-0B1C86391842} = {B6808F71-30B4-4499-8FF6-0B1C86391842} + {D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm64 = Debug|arm64 @@ -134,6 +142,24 @@ Global {B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|Win32.Build.0 = ReleaseLTCG|Win32 {B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 {B6808F71-30B4-4499-8FF6-0B1C86391842}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|arm64.ActiveCfg = Debug|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|arm64.Build.0 = Debug|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|Win32.ActiveCfg = Debug|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|Win32.Build.0 = Debug|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|x64.ActiveCfg = Debug|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Debug|x64.Build.0 = Debug|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|arm64.ActiveCfg = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|arm64.Build.0 = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|Win32.ActiveCfg = Release|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|Win32.Build.0 = Release|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|x64.ActiveCfg = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.Release|x64.Build.0 = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|arm64.ActiveCfg = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|arm64.Build.0 = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|Win32.ActiveCfg = Release|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|Win32.Build.0 = Release|Win32 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|x64.ActiveCfg = Release|x64 + {70EEED2D-2344-4F28-87B7-3EFC4E78B923}.ReleaseLTCG|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -144,6 +170,7 @@ Global {62B020FA-E4FB-4C6E-B32A-DC999470F155} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0} {8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB} {B6808F71-30B4-4499-8FF6-0B1C86391842} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB} + {70EEED2D-2344-4F28-87B7-3EFC4E78B923} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AE225595-70B7-4580-92EF-6F2B461EBFC7} diff --git a/src/openrct2-data/openrct2-data.vcxproj b/src/openrct2-data/openrct2-data.vcxproj new file mode 100644 index 0000000000..591ffd9478 --- /dev/null +++ b/src/openrct2-data/openrct2-data.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Debug + arm64 + + + ReleaseLTCG + arm64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + + + Release + Win32 + + + Release + x64 + + + Release + arm64 + + + + + {70eeed2d-2344-4f28-87b7-3efc4e78b923} + openrct2-data + true + + + + Utility + + + + + + openrct2-data + $(SolutionDir)bin;$(LibraryPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e487cec14f36bebc9022c52c3084363e8a8e430b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Tue, 22 Apr 2025 02:21:54 +0300 Subject: [PATCH 2/4] Make the g2 task shared, remove duplication --- openrct2.proj | 28 ++---- openrct2.targets | 121 ++++++++++++++++++++++++ src/openrct2-data/openrct2-data.vcxproj | 111 +--------------------- 3 files changed, 129 insertions(+), 131 deletions(-) diff --git a/openrct2.proj b/openrct2.proj index f73f372339..b5f498665d 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -8,9 +8,6 @@ - OPENRCT2_DESCRIBE --> - - - Debug x64 @@ -27,7 +24,6 @@ $(RootDir)bin\ $(TargetDir)openrct2.exe - $(TargetDir)data\g2.dat $(SlnProperties);Platform=$(Platform) @@ -55,10 +51,6 @@ 6061B53DE346BD853BB997E635AC7374B1A7D2F0 - - - - - + @@ -97,24 +89,14 @@ $(SlnProperties);Configuration=$(Configuration) - + $(SlnProperties);Configuration=$(Configuration) - - - - - - - - - + @@ -161,4 +143,8 @@ CheckFile="$(DependenciesCheckFile)" OutputDirectory="$(TargetDir)testdata\replays" /> + + + + diff --git a/openrct2.targets b/openrct2.targets index dc3271132c..4611366500 100644 --- a/openrct2.targets +++ b/openrct2.targets @@ -329,4 +329,125 @@ + + + + $(MSBuildThisFileDirectory) + $(SolutionDir)bin\ + + + openrct2-cli + $(SolutionDir)src\$(CLIProjectName)\$(CLIProjectName).vcxproj + $(OutDir)$(CLIProjectName).exe + + + $(OutDir)data\ + + $(SolutionDir)data\language\ + $(SolutionDir)data\shaders\ + $(SolutionDir)data\scenario_patches\ + $(SolutionDir)resources\g2\ + $(ResourcesG2Path)sprites.json + $(OutDir)data\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/openrct2-data/openrct2-data.vcxproj b/src/openrct2-data/openrct2-data.vcxproj index 591ffd9478..55f4bf7315 100644 --- a/src/openrct2-data/openrct2-data.vcxproj +++ b/src/openrct2-data/openrct2-data.vcxproj @@ -56,115 +56,6 @@ $(SolutionDir)bin;$(LibraryPath) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file From 6ccbfd46d593ddc1122cff7d85d42d377f49ce0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Tue, 22 Apr 2025 02:31:54 +0300 Subject: [PATCH 3/4] Allow tasks to run as single tasks from msbuild --- openrct2.targets | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openrct2.targets b/openrct2.targets index 4611366500..7ac1e46905 100644 --- a/openrct2.targets +++ b/openrct2.targets @@ -371,7 +371,6 @@ @@ -391,8 +390,7 @@ @@ -412,8 +410,7 @@ @@ -432,8 +429,8 @@ Condition="'@(CopiedScenarioFiles)' != ''" /> - @@ -450,4 +447,6 @@ ForceTouch="true" AlwaysCreate="true" /> + + From 4864b0aa0695405dbc565edaadb401843c154d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Tue, 22 Apr 2025 03:17:54 +0300 Subject: [PATCH 4/4] Remove the odd copying of data files, use the targets instead --- openrct2.proj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openrct2.proj b/openrct2.proj index b5f498665d..b2801449b0 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -76,12 +76,7 @@ $(BuildString) ($(OPENRCT2_BRANCH)) $(BuildString) ($(OPENRCT2_DESCRIBE)) - - - - -