From 9babdac92839eea3c36b4d63d06a9c5cffc1a9f1 Mon Sep 17 00:00:00 2001 From: neoapps-dev Date: Wed, 8 Apr 2026 12:44:56 +0300 Subject: [PATCH] fix: linux cross-compiling --- Minecraft.Client/Common/Audio/SoundEngine.cpp | 8 +- .../Common/UI/UIScene_DeathMenu.cpp | 4 +- Minecraft.Client/Common/UI/UIScene_HUD.cpp | 4 +- Minecraft.Client/PendingConnection.cpp | 2 +- Minecraft.Client/stdafx.h | 96 +++++++++---------- Minecraft.Server/cmake/sources/Common.cmake | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 88b33998..ad0b9890 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -2,10 +2,10 @@ #include "SoundEngine.h" #include "../Consoles_App.h" -#include "../../MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/net.minecraft.world.level.h" -#include "../../Minecraft.World/leveldata.h" -#include "../../Minecraft.World/mth.h" +#include "../../Minecraft.World/LevelData.h" +#include "../../Minecraft.World/Mth.h" #include "../../TexturePackRepository.h" #include "../../DLCTexturePack.h" #include "../../MultiPlayerGameMode.h" @@ -1576,4 +1576,4 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac return buf; } -#endif \ No newline at end of file +#endif diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp index a597cb54..4141c201 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -4,7 +4,7 @@ #include "IUIScene_PauseMenu.h" #include "../../Minecraft.h" #include "../../MultiPlayerLevel.h" -#include "../../MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLocalPlayer.h" #include "../../MinecraftServer.h" #include "../../../Minecraft.World/net.minecraft.world.level.storage.h" @@ -224,4 +224,4 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) } break; } -} \ No newline at end of file +} diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp index fb69c087..d4224972 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -4,7 +4,7 @@ #include "UISplitScreenHelpers.h" #include "BossMobGuiInfo.h" #include "../../Minecraft.h" -#include "../../MultiplayerLocalPlayer.h" +#include "../../MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h" #include "../../EnderDragonRenderer.h" #include "../../../Minecraft.World/net.minecraft.world.inventory.h" @@ -900,4 +900,4 @@ void UIScene_HUD::handleGameTick() updateFrameTick(); } -} \ No newline at end of file +} diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index 25b3701f..9a6c3230 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -8,7 +8,7 @@ #include "PlayerList.h" #include "MinecraftServer.h" #include "../Minecraft.World/net.minecraft.network.h" -#include "../Minecraft.World/pos.h" +#include "../Minecraft.World/Pos.h" #include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "../Minecraft.World/net.minecraft.world.level.storage.h" #include "../Minecraft.World/net.minecraft.world.item.h" diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h index 4d9a5b16..94d9ee98 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -209,18 +209,18 @@ typedef XUID GameSessionUID; #include "Common\XUI\XUI_Scene_Base.h" #endif -#include "Common\App_defines.h" -#include "Common\UI\UIEnums.h" -#include "Common\UI\UIStructs.h" +#include "Common/App_Defines.h" +#include "Common/UI/UIEnums.h" +#include "Common/UI/UIStructs.h" // #ifdef _XBOX -#include "Common\App_enums.h" -#include "Common\Tutorial\TutorialEnum.h" -#include "Common\App_structs.h" +#include "Common/App_enums.h" +#include "Common/Tutorial\TutorialEnum.h" +#include "Common/App_structs.h" //#endif -#include "Common\Consoles_App.h" -#include "Common\Minecraft_Macros.h" -#include "Common\BuildVer.h" +#include "Common/Consoles_App.h" +#include "Common/Minecraft_Macros.h" +#include "Common/BuildVer.h" // Ensure fallback defines if BuildVer.h wasn't picked up by include paths #ifndef VER_FILEVERSION_STR_W @@ -277,18 +277,18 @@ typedef XUID GameSessionUID; #include "Durango\Iggy\gdraw\gdraw_d3d11.h" #include "Durango\Durango_UIController.h" #elif defined _WINDOWS64 - #include "Windows64\Sentient\MinecraftTelemetry.h" - #include "Windows64Media\strings.h" - #include "Windows64\Windows64_App.h" - #include "Windows64\Sentient\DynamicConfigurations.h" - #include "Windows64\Sentient\SentientTelemetryCommon.h" - #include "Windows64\GameConfig\Minecraft.spa.h" - #include "Windows64\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Windows64\Iggy\include\iggy.h" - #include "Windows64\Iggy\gdraw\gdraw_d3d11.h" - #include "Windows64\Windows64_UIController.h" + #include "Windows64/Sentient\MinecraftTelemetry.h" + #include "Windows64Media/strings.h" + #include "Windows64/Windows64_App.h" + #include "Windows64/Sentient/DynamicConfigurations.h" + #include "Windows64/Sentient/SentientTelemetryCommon.h" + #include "Windows64/GameConfig/Minecraft.spa.h" + #include "Windows64/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Windows64/Iggy/include/iggy.h" + #include "Windows64/Iggy/gdraw/gdraw_d3d11.h" + #include "Windows64/Windows64_UIController.h" #elif defined __PSVITA__ #include "PSVita\PSVita_App.h" #include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this @@ -303,19 +303,19 @@ typedef XUID GameSessionUID; #include "PSVita\Iggy\gdraw\gdraw_psp2.h" #include "PSVita\PSVita_UIController.h" #else - #include "Orbis\Sentient\MinecraftTelemetry.h" - #include "OrbisMedia\strings.h" - #include "Orbis\Orbis_App.h" - #include "Orbis\Sentient\SentientTelemetryCommon.h" - #include "Orbis\Sentient\DynamicConfigurations.h" - #include "Orbis\GameConfig\Minecraft.spa.h" - #include "OrbisMedia\4J_strings.h" - #include "Orbis\XML\ATGXmlParser.h" - #include "Windows64\Social\SocialManager.h" - #include "Common\Audio\SoundEngine.h" - #include "Orbis\Iggy\include\iggy.h" - #include "Orbis\Iggy\gdraw\gdraw_orbis.h" - #include "Orbis\Orbis_UIController.h" + #include "Orbis/Sentient/MinecraftTelemetry.h" + #include "OrbisMedia/strings.h" + #include "Orbis/Orbis_App.h" + #include "Orbis/Sentient/SentientTelemetryCommon.h" + #include "Orbis/Sentient/DynamicConfigurations.h" + #include "Orbis/GameConfig/Minecraft.spa.h" + #include "OrbisMedia/4J_strings.h" + #include "Orbis/XML/ATGXmlParser.h" + #include "Windows64/Social/SocialManager.h" + #include "Common/Audio/SoundEngine.h" + #include "Orbis/Iggy/include/iggy.h" + #include "Orbis/Iggy/gdraw/gdraw_orbis.h" + #include "Orbis/Orbis_UIController.h" #endif #ifdef _XBOX @@ -327,20 +327,20 @@ typedef XUID GameSessionUID; #include "Common\XUI\XUI_TutorialPopup.h" #include "Common\XUI\XUI_PauseMenu.h" #endif -#include "Common\ConsoleGameMode.h" -#include "Common\Console_Debug_enum.h" -#include "Common\Console_Awards_enum.h" -#include "Common\Tutorial\TutorialMode.h" -#include "Common\Tutorial\Tutorial.h" -#include "Common\Tutorial\FullTutorialMode.h" -#include "Common\Trial\TrialMode.h" -#include "Common\GameRules\ConsoleGameRules.h" -#include "Common\GameRules\ConsoleSchematicFile.h" -#include "Common\Colours\ColourTable.h" -#include "Common\DLC\DLCSkinFile.h" -#include "Common\DLC\DLCManager.h" -#include "Common\DLC\DLCPack.h" -#include "Common\Telemetry\TelemetryManager.h" +#include "Common/ConsoleGameMode.h" +#include "Common/Console_Debug_enum.h" +#include "Common/Console_Awards_enum.h" +#include "Common/Tutorial/TutorialMode.h" +#include "Common/Tutorial/Tutorial.h" +#include "Common/Tutorial/FullTutorialMode.h" +#include "Common/Trial/TrialMode.h" +#include "Common/GameRules/ConsoleGameRules.h" +#include "Common/GameRules/ConsoleSchematicFile.h" +#include "Common/Colours/ColourTable.h" +#include "Common/DLC/DLCSkinFile.h" +#include "Common/DLC/DLCManager.h" +#include "Common/DLC/DLCPack.h" +#include "Common/Telemetry/TelemetryManager.h" #ifdef _XBOX //#include "Xbox\Xbox_App.h" diff --git a/Minecraft.Server/cmake/sources/Common.cmake b/Minecraft.Server/cmake/sources/Common.cmake index bf87129b..ba5fb060 100644 --- a/Minecraft.Server/cmake/sources/Common.cmake +++ b/Minecraft.Server/cmake/sources/Common.cmake @@ -508,7 +508,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT "${_MS_SRC}/../Minecraft.World/LivingEntity.h" "${_MS_SRC}/../Minecraft.World/Player.cpp" "${_MS_SRC}/../Minecraft.World/Player.h" - "${_MS_SRC}/../Minecraft.World/ThrownEnderPearl.cpp" + "${_MS_SRC}/../Minecraft.World/ThrownEnderpearl.cpp" "${_MS_SRC}/../Minecraft.World/Tile.cpp" "${_MS_SRC}/../Minecraft.World/DyePowderItem.cpp" "${_MS_SRC}/../Minecraft.World/DyePowderItem.h"