From 6d4ce5136cccb994883473871db03e9d50e6b683 Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Tue, 3 Mar 2026 17:33:58 +0800
Subject: [PATCH 1/4] fix: fix executable icon when using cmake

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3ae11260..f14cf6272 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.24)
 
-project(MinecraftConsoles LANGUAGES C CXX ASM_MASM)
+project(MinecraftConsoles LANGUAGES C CXX RC ASM_MASM)
 
 if(NOT WIN32)
   message(FATAL_ERROR "This CMake build currently supports Windows only.")
@@ -17,6 +17,9 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ClientSources.cmake")
 
 list(TRANSFORM MINECRAFT_WORLD_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/")
 list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
+list(APPEND MINECRAFT_CLIENT_SOURCES
+  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/MinecraftWindows.rc"
+)
 
 add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES})
 target_include_directories(MinecraftWorld PRIVATE

From 2915044f953bc6cd3a28291fbb5661080d58bb30 Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Tue, 3 Mar 2026 17:40:03 +0800
Subject: [PATCH 2/4] chore: sync VS release optimization flags into CMake
 build

---
 CMakeLists.txt | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f14cf6272..8e40e5db3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,15 @@ endif()
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
+function(configure_msvc_target target)
+  target_compile_options(${target} PRIVATE
+    $<$<COMPILE_LANGUAGE:C,CXX>:/W3>
+    $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
+    $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
+    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL /O2 /Ob3 /Oi /GT /GF>
+  )
+endfunction()
+
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/WorldSources.cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ClientSources.cmake")
 
@@ -31,11 +40,7 @@ target_compile_definitions(MinecraftWorld PRIVATE
   $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
 )
 if(MSVC)
-  target_compile_options(MinecraftWorld PRIVATE
-    $<$<COMPILE_LANGUAGE:C,CXX>:/W3>
-    $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
-    $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
-  )
+  configure_msvc_target(MinecraftWorld)
 endif()
 
 add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
@@ -50,10 +55,9 @@ target_compile_definitions(MinecraftClient PRIVATE
   $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
 )
 if(MSVC)
-  target_compile_options(MinecraftClient PRIVATE
-    $<$<COMPILE_LANGUAGE:C,CXX>:/W3>
-    $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
-    $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
+  configure_msvc_target(MinecraftClient)
+  target_link_options(MinecraftClient PRIVATE
+    $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
   )
 endif()
 

From a97ee4aab16cd46c8466ea89c99a437d27be6491 Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Tue, 3 Mar 2026 17:45:25 +0800
Subject: [PATCH 3/4] chore: sync VS Release warning-disable setting into CMake

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e40e5db3..977bce2d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,8 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 function(configure_msvc_target target)
   target_compile_options(${target} PRIVATE
-    $<$<COMPILE_LANGUAGE:C,CXX>:/W3>
+    $<$<AND:$<NOT:$<CONFIG:Release>>,$<COMPILE_LANGUAGE:C,CXX>>:/W3>
+    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/W0>
     $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
     $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
     $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL /O2 /Ob3 /Oi /GT /GF>

From 1444581cb61e62cd71c855c278c840dd009149f0 Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Tue, 3 Mar 2026 17:58:47 +0800
Subject: [PATCH 4/4] chore: remove duplicated /Ob3 flag from CMake Release
 optimization settings

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977bce2d0..74851754d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ function(configure_msvc_target target)
     $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/W0>
     $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
     $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
-    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL /O2 /Ob3 /Oi /GT /GF>
+    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL /O2 /Oi /GT /GF>
   )
 endfunction()