From 51491318288ec49a8f3962dfa15bcc464734f412 Mon Sep 17 00:00:00 2001
From: izzy <izz@int.moe>
Date: Wed, 4 Mar 2026 13:15:53 -0500
Subject: [PATCH] misc: file cleanup

---
 CMakeLists.txt                                | 61 +++++--------------
 Minecraft.Client/Common/Tutorial/InfoTask.cpp | 10 ++-
 2 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cceeb0569..2894cca53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,52 +90,23 @@ if(BACKEND STREQUAL "Windows64")
 
   list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
 
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ClientSources.cmake")
-
-# each backend is assumed to change these in some way.
-set(BACKEND_SOURCES
-  "glWrapper.cpp"
-  "stubs.cpp"
-  "stdafx.cpp"
-  "iob_shim.asm"
-  "Windows64/Iggy/gdraw/gdraw_d3d11.cpp"
-  "Windows64/KeyboardMouseInput.cpp"
-  "Windows64/Leaderboards/WindowsLeaderboardManager.cpp"
-  "Windows64/Windows64_App.cpp"
-  "Windows64/Windows64_Minecraft.cpp"
-  "Windows64/Windows64_UIController.cpp"
-  "Windows64/Network/WinsockNetLayer.cpp"
-)
-
-# remove backend specific stuff
-set(CLIENT_SHARED_SOURCES ${MINECRAFT_CLIENT_SOURCES})
-list(REMOVE_ITEM CLIENT_SHARED_SOURCES ${BACKEND_SOURCES})
-list(TRANSFORM CLIENT_SHARED_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
-
-if(BACKEND STREQUAL "Windows64")
-  if(NOT WIN32)
-    message(FATAL_ERROR "The Windows64 backend can only be built on Windows.")
-  endif()
-
-  list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
-
-add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
-target_include_directories(MinecraftClient PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
-)
-target_compile_definitions(MinecraftClient PRIVATE
-  $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-  $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-)
-if(MSVC)
-  configure_msvc_target(MinecraftClient)
-  target_compile_options(MinecraftClient PRIVATE
-    $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
+  add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
+  target_include_directories(MinecraftClient PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
+    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
   )
-endif()
+  target_compile_definitions(MinecraftClient PRIVATE
+    $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
+    $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
+  )
+  if(MSVC)
+    configure_msvc_target(MinecraftClient)
+    target_compile_options(MinecraftClient PRIVATE
+      $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
+    )
+  endif()
 
   set_target_properties(MinecraftClient PROPERTIES
     VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:MinecraftClient>"
diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
index 52d1c5819..b33a28050 100644
--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@@ -1,18 +1,16 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
-=======
-#include "Minecraft.Client/Minecraft.h"
-#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
->>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
 #include "Minecraft.World/Material.h"
-#include "..\..\KeyboardMouseInput.h"
+
+#ifdef _WINDOWS64
+#include "Minecraft.Client/Windows64/KeyboardMouseInput.h"
+#endif
 
 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)