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
This commit is contained in:
rtm516
2026-03-17 21:39:22 +00:00
committed by GitHub
parent 1a3fcb5b20
commit 02a5961f39
106 changed files with 8070 additions and 72800 deletions

View File

@@ -1 +0,0 @@
C:\Users\manea\Documents\MinecraftConsoles\Minecraft.World\ARM64EC_Debug\Minecraft.World.lib

View File

@@ -0,0 +1,30 @@
include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Durango.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/CommonSources.cmake")
# Combine all source files into a single variable for the target
# We cant use CMAKE_CONFIGURE_PRESET here as VS doesn't set it, so just rely on the folder
set(MINECRAFT_WORLD_SOURCES
${MINECRAFT_WORLD_COMMON}
$<$<STREQUAL:${PLATFORM_NAME},Durango>:${MINECRAFT_WORLD_DURANGO}>
${SOURCES_COMMON}
)
add_library(Minecraft.World STATIC ${MINECRAFT_WORLD_SOURCES})
target_include_directories(Minecraft.World
PRIVATE
"${CMAKE_BINARY_DIR}/generated/"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/include/"
PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/x64headers"
)
target_compile_definitions(Minecraft.World PRIVATE
${MINECRAFT_SHARED_DEFINES}
_LIB
)
target_precompile_headers(Minecraft.World PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:stdafx.h>")
configure_compiler_target(Minecraft.World)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

View File

@@ -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"
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,9 @@
set(_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS
"${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.h"
)
source_group("net/minecraft/stats" FILES ${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS})
set(MINECRAFT_WORLD_DURANGO
${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS}
)

View File

@@ -1,18 +0,0 @@
-xc++
-m64
-std=c++14
-Wno-unused-includes
-Wno-unsafe-buffer-usage-in-libc-call
-Wno-unsafe-buffer-usage
-Wno-unused-macros
-Wno-c++98-compat
-Wno-c++98-compat-pedantic
-Wno-pre-c++14-compat
-D_LARGE_WORLDS
-D_DEBUG_MENUS_ENABLED
-D_LIB
-D_CRT_NON_CONFORMING_SWPRINTFS
-D_CRT_SECURE_NO_WARNINGS
-D_WINDOWS64
-I
./x64headers

View File

@@ -192,7 +192,7 @@ void MemSect(int sect);
#include "..\Minecraft.Client\Common\Minecraft_Macros.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "..\Minecraft.Client\Common\BuildVer.h"
#include "Common\BuildVer.h"
#ifdef _XBOX
#include "..\Minecraft.Client\Xbox\Xbox_App.h"