From 02a5961f39673be403fda3edbf6fb1265bd93477 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Tue, 17 Mar 2026 21:39:22 +0000 Subject: Move project to CMake (#781) * Move to cmake * Move sources to source_groups and ditch more old VS files * Add BuildVer.h generation * Break out cmake source lists to platforms * Don't copy swf files * Revert audio changes from merge * Add platform defines * Match MSBuild flags * Move BuildVer.h to common include and fix rebuild issue * Seperate projects properly * Exclude more files and make sure GameHDD exists * Missing line * Remove remaining VS project files * Update readme and actions * Use incremental LTCG * Update workflows * Update build workflows and output folder * Disable vcpkg checks * Force MSVC * Use precompiled headers * Only use PCH for cpp * Exclude compat_shims from PCH * Handle per-platform source includes * Copy only current platform media * Define Iggy libs per platform * Fix EnsureGameHDD check * Only set WIN32_EXECUTABLE on Windows * Correct Iggy libs path * Remove include of terrain_MipmapLevel * Correct path to xsb/xwb * Implement copilot suggestions * Add clang flags (untested) * Fix robocopy error checking * Update documentation * Drop CMakePresets.json version as we dont use v6 features * Always cleanup artifacts in nightly even if some builds fail * Re-work compiler target options * Move newer iggy dll into redist and cleanup * Fix typos * Remove 'Source Files' from all source groups * Remove old ps1 build scripts --- Minecraft.Client/Common/BuildVer.h | 7 -- Minecraft.Client/Common/CommonMedia.sln | 28 ----- Minecraft.Client/Common/CommonMedia.vcxproj | 115 ----------------- .../Common/CommonMedia.vcxproj.filters | 136 --------------------- .../TitleUpdate/GameRules/BuildOnly/GameRules.sln | 30 ----- .../GameRules/BuildOnly/GameRules.vcxproj | 103 ---------------- .../GameRules/BuildOnly/GameRules.vcxproj.filters | 114 ----------------- .../GameRules/BuildOnly/GameRules.vcxproj.vspscc | 10 -- 8 files changed, 543 deletions(-) delete mode 100644 Minecraft.Client/Common/BuildVer.h delete mode 100644 Minecraft.Client/Common/CommonMedia.sln delete mode 100644 Minecraft.Client/Common/CommonMedia.vcxproj delete mode 100644 Minecraft.Client/Common/CommonMedia.vcxproj.filters delete mode 100644 Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln delete mode 100644 Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj delete mode 100644 Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters delete mode 100644 Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc (limited to 'Minecraft.Client/Common') diff --git a/Minecraft.Client/Common/BuildVer.h b/Minecraft.Client/Common/BuildVer.h deleted file mode 100644 index eaa77d26..00000000 --- a/Minecraft.Client/Common/BuildVer.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#define VER_PRODUCTBUILD 560 -#define VER_PRODUCTVERSION_STR_W L"DEV (unknown version)" -#define VER_FILEVERSION_STR_W VER_PRODUCTVERSION_STR_W -#define VER_BRANCHVERSION_STR_W L"UNKNOWN BRANCH" -#define VER_NETWORK VER_PRODUCTBUILD diff --git a/Minecraft.Client/Common/CommonMedia.sln b/Minecraft.Client/Common/CommonMedia.sln deleted file mode 100644 index 9f83988e..00000000 --- a/Minecraft.Client/Common/CommonMedia.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}" -EndProject -Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = CommonMedia.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.ActiveCfg = Debug|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.Build.0 = Debug|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.ActiveCfg = Release|Win32 - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Minecraft.Client/Common/CommonMedia.vcxproj b/Minecraft.Client/Common/CommonMedia.vcxproj deleted file mode 100644 index 5a472e0b..00000000 --- a/Minecraft.Client/Common/CommonMedia.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {21BBD32C-AF5E-4741-8B80-3B73FC0D0F27} - MakeFileProj - SAK - SAK - SAK - SAK - - - - Makefile - true - v110 - - - Makefile - false - v110 - - - - - - - - - - - - - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - echo Creating languages.loc -copy .\Media\strings.resx .\Media\en-EN.lang -copy .\Media\fr-FR\strings.resx .\Media\fr-FR\fr-FR.lang -copy .\Media\ja-JP\strings.resx .\Media\ja-JP\ja-JP.lang -..\..\..\Tools\NewLocalisationPacker.exe --static .\Media .\Media\languages.loc - -echo Making archive -..\..\..\Tools\ArchiveFilePacker.exe -cd $(ProjectDir)\Media media.arc media.txt - -echo Copying Durango strings.h -copy .\Media\strings.h ..\Durango\strings.h - -echo Copying PS3 strings.h -copy .\Media\strings.h ..\PS3\strings.h - -echo Copying PS4 strings.h -copy .\Media\strings.h ..\Orbis\strings.h - -echo Copying Win strings.h -copy .\Media\strings.h ..\Windows64\strings.h - - - WIN32;NDEBUG;$(NMakePreprocessorDefinitions) - - - - - - - \ No newline at end of file diff --git a/Minecraft.Client/Common/CommonMedia.vcxproj.filters b/Minecraft.Client/Common/CommonMedia.vcxproj.filters deleted file mode 100644 index 9fb0927d..00000000 --- a/Minecraft.Client/Common/CommonMedia.vcxproj.filters +++ /dev/null @@ -1,136 +0,0 @@ - - - - - {55c7ab2e-b3e5-4aed-9ffe-3308591d9c34} - - - {eaa0eb72-0b27-4080-ad53-f68e42f37ba8} - - - {711ad95b-eb56-4e18-b001-34ad7b8075a3} - - - {1432ec3d-c5d0-46da-91b6-e7737095a97e} - - - {4b2aeaf1-04d7-454d-b2d9-08364799831c} - - - {4b0eaef6-fa2f-4605-b0da-a81ffb5659bc} - - - {bf1c74da-21f1-4bdd-98ed-83457946e4cc} - - - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - Archive - - - Archive - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - IggyMedia - - - - - Strings - - - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Strings - - - Archive - - - - - Archive\Durango - - - Archive\PS3 - - - Archive\PS4 - - - Archive\Win64 - - - \ No newline at end of file diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln deleted file mode 100644 index 31c1bd39..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln +++ /dev/null @@ -1,30 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}" -EndProject -Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark - SccProjectUniqueName0 = GameRules.vcxproj - SccLocalPath0 = . - SccLocalPath1 = . - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Xbox 360 = Debug|Xbox 360 - Release|Xbox 360 = Release|Xbox 360 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj deleted file mode 100644 index 0bcb4e30..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - Xbox 360 - - - Release - Xbox 360 - - - - {0DD2FD59-36AC-476F-9201-D687A4CE9E98} - MakeFileProj - SAK - SAK - SAK - SAK - - - - Makefile - - - Makefile - - - - - - - - - - - - - - - _DEBUG;$(NMakePreprocessorDefinitions) - BuildGameRule.cmd Tutorial - - - GameRules.xex - NDEBUG;$(NMakePreprocessorDefinitions) - - - - - - - - CopyToHardDrive - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - \ No newline at end of file diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters deleted file mode 100644 index 9c46ad82..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {ab02d5da-7fb3-494b-a636-03764d9a8acd} - - - {e1a87048-bca2-46e6-a234-91d7d64eb983} - - - {da425f4a-cf76-48e8-87cb-d9fda0f42365} - - - {c0ba5f53-4881-495e-8158-5d87f379426d} - - - {61651432-41a1-42f0-a853-c7795d813418} - - - {e194e42b-1c9b-4e35-9a4b-dabd68eab3e0} - - - - - Tutorial - - - Tutorial\Loc - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Tutorial\Loc\Microsoft - - - Packs - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - Tutorial\schematics - - - - - - - - - - - - - Shared - - - \ No newline at end of file diff --git a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc b/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc deleted file mode 100644 index b6d32892..00000000 --- a/Minecraft.Client/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} -- cgit v1.2.3