mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-07-08 08:27:06 +00:00
fix: linux cross-compiling
This commit is contained in:
parent
222852c11b
commit
9babdac928
|
|
@ -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
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue