diff --git a/Minecraft.Client/ArchiveFile.h b/Minecraft.Client/ArchiveFile.h index 722d570d8..7b228dcf3 100644 --- a/Minecraft.Client/ArchiveFile.h +++ b/Minecraft.Client/ArchiveFile.h @@ -3,8 +3,8 @@ #include #include -#include "..\Minecraft.World\File.h" -#include "..\Minecraft.World\ArrayWithLength.h" +#include "../Minecraft.World/File.h" +#include "../Minecraft.World/ArrayWithLength.h" using namespace std; @@ -35,4 +35,4 @@ public: bool hasFile(const wstring &filename); int getFileSize(const wstring &filename); byteArray getFile(const wstring &filename); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h index 4ec760361..ea19fa77c 100644 --- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h +++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\..\Minecraft.World\SoundTypes.h" +#include "../../../Minecraft.World/SoundTypes.h" #ifdef _XBOX @@ -16,6 +16,9 @@ #include "..\..\Durango\Miles\include\mss.h" #elif defined _WINDOWS64 #include "..\..\windows64\Miles\include\mss.h" +#elif defined(__linux__) +// (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones +// #include "../../windows64/Miles/include/mss.h" #else // PS4 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT2 diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h index 143560102..6a0fb55d6 100644 --- a/Minecraft.Client/Common/Consoles_App.h +++ b/Minecraft.Client/Common/Consoles_App.h @@ -3,25 +3,28 @@ using namespace std; #include "Audio/Consoles_SoundEngine.h" - +#ifndef __linux__ #include -#include "..\Common\Tutorial\TutorialEnum.h" +#endif +#include "../Common/Tutorial/TutorialEnum.h" #ifdef _XBOX #include "..\Common\XUI\XUI_Helper.h" #include "..\Common\XUI\XUI_HelpCredits.h" #endif -#include "UI\UIStructs.h" +#include "UI/UIStructs.h" -#include "..\..\Minecraft.World\DisconnectPacket.h" +#include "../../Minecraft.World/DisconnectPacket.h" +#ifndef __linux__ #include +#endif // __linux__ -#include "..\StringTable.h" -#include "..\Common\DLC\DLCManager.h" -#include "..\Common\GameRules\ConsoleGameRulesConstants.h" -#include "..\Common\GameRules\GameRuleManager.h" -#include "..\SkinBox.h" -#include "..\ArchiveFile.h" +#include "../StringTable.h" +#include "../Common/DLC/DLCManager.h" +#include "../Common/GameRules/ConsoleGameRulesConstants.h" +#include "../Common/GameRules/GameRuleManager.h" +#include "../SkinBox.h" +#include "../ArchiveFile.h" typedef struct _JoinFromInviteData { diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Common/DLC/DLCSkinFile.h index c8dcf0e9c..3e571993e 100644 --- a/Minecraft.Client/Common/DLC/DLCSkinFile.h +++ b/Minecraft.Client/Common/DLC/DLCSkinFile.h @@ -1,6 +1,6 @@ #pragma once #include "DLCFile.h" -#include "..\..\..\Minecraft.Client\HumanoidModel.h" +#include "../../../Minecraft.Client/HumanoidModel.h" class DLCSkinFile : public DLCFile { @@ -26,4 +26,4 @@ public: int getAdditionalBoxesCount(); unsigned int getAnimOverrideBitmask() { return m_uiAnimOverrideBitmask;} bool isFree() {return m_bIsFree;} -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h index 5b97b1085..24170b7c1 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h +++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h @@ -1,6 +1,6 @@ #pragma once #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructurePiece.h" +#include "../../../Minecraft.World/StructurePiece.h" class Level; class Random; @@ -35,4 +35,4 @@ public: bool checkIntersects(int x0, int y0, int z0, int x1, int y1, int z1); virtual int getMinY(); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h index f37a60585..d02c26451 100644 --- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h +++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h @@ -4,7 +4,7 @@ using namespace std; #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #define XBOX_SCHEMATIC_CURRENT_VERSION 2 -#include "..\..\..\Minecraft.World\ArrayWithLength.h" +#include "../../../Minecraft.World/ArrayWithLength.h" class Level; class DataOutputStream; @@ -87,4 +87,4 @@ private: void chunkCoordToSchematicCoord(AABB *destinationBox, int chunkX, int chunkZ, ESchematicRotation rot, int &schematicX, int &schematicZ); void schematicCoordToChunkCoord(AABB *destinationBox, double schematicX, double schematicZ, ESchematicRotation rot, double &chunkX, double &chunkZ); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h index afec8fbcc..9960bf834 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h +++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h @@ -3,7 +3,7 @@ using namespace std; #include #include -#include "..\..\..\Minecraft.World\ItemInstance.h" +#include "../../../Minecraft.World/ItemInstance.h" #include "ConsoleGameRulesConstants.h" #include "GameRulesInstance.h" @@ -63,4 +63,4 @@ public: static GameRulesInstance *generateNewGameRulesInstance(GameRulesInstance::EGameRulesInstanceType type, LevelRuleset *rules, Connection *connection); static wstring generateDescriptionString(ConsoleGameRules::EGameRuleType defType, const wstring &description, void *data = NULL, int dataLength = 0); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h index 0cc9da796..cff00be23 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h @@ -4,7 +4,7 @@ using namespace std; #pragma message("LevelGenerationOptions.h ") #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructureFeature.h" +#include "../../../Minecraft.World/StructureFeature.h" class ApplySchematicRuleDefinition; class LevelChunk; @@ -213,4 +213,4 @@ public: // This file contains state that needs to be deleted // or reset once a game has finished. void reset_finish(); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/StartFeature.h b/Minecraft.Client/Common/GameRules/StartFeature.h index d3f1280a2..52be174c0 100644 --- a/Minecraft.Client/Common/GameRules/StartFeature.h +++ b/Minecraft.Client/Common/GameRules/StartFeature.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\StructureFeature.h" +#include "../../../Minecraft.World/StructureFeature.h" class StartFeature : public GameRuleDefinition { @@ -19,4 +19,4 @@ public: virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue); bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h index ad64bfe47..ff4bd2c22 100644 --- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h +++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h @@ -2,7 +2,7 @@ using namespace std; #include "GameRuleDefinition.h" -#include "..\..\..\Minecraft.World\Pos.h" +#include "../../../Minecraft.World/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { @@ -21,4 +21,4 @@ public: virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue); virtual bool onUseTile(GameRule *rule, int tileId, int x, int y, int z); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h index 1bb532dab..9971cd194 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.h +++ b/Minecraft.Client/Common/Network/GameNetworkManager.h @@ -1,8 +1,10 @@ #pragma once using namespace std; #include +#ifndef __linux__ #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#endif +#include "../../../Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #ifdef _XBOX #include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h" diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h index 901e59e72..282652205 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h @@ -1,8 +1,10 @@ #pragma once using namespace std; #include +#ifndef __linux__ #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#endif // __linux__ +#include "../../../Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h index f997dece5..bbd84997e 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h @@ -1,7 +1,7 @@ #pragma once using namespace std; #include -#include "..\..\..\Minecraft.World\C4JThread.h" +#include "../../../Minecraft.World/C4JThread.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerInterface.h" #include "SessionInfo.h" diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h index 40b6c04c6..fbe48bdd3 100644 --- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h +++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\Common\UI\UIEnums.h" +#include "../../Common/UI/UIEnums.h" class CTelemetryManager { @@ -62,4 +62,4 @@ protected: INT GetLevelExitProgressStat2(); }; -extern CTelemetryManager *TelemetryManager; \ No newline at end of file +extern CTelemetryManager *TelemetryManager; diff --git a/Minecraft.Client/Model.h b/Minecraft.Client/Model.h index e4161d0cb..8bf8b0a6e 100644 --- a/Minecraft.Client/Model.h +++ b/Minecraft.Client/Model.h @@ -1,7 +1,7 @@ #pragma once using namespace std; -#include "..\Minecraft.World\Random.h" -#include "..\Minecraft.Client\SkinBox.h" +#include "../Minecraft.World/Random.h" +#include "../Minecraft.Client/SkinBox.h" class Mob; class ModelPart; class TexOffs; diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index 614f997b0..c70e426ee 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -90,6 +90,10 @@ typedef XUID GameSessionUID; #include "PSVitaTypes.h" #include "PSVitaStubs.h" #include "PSVitaMaths.h" +#elif defined(__linux__) +#include +#include +#include #else #include #include @@ -116,10 +120,10 @@ typedef XUID GameSessionUID; #include #endif -#ifndef _XBOX +#if !defined(__linux__) #include "extraX64.h" #else -#include "..\Minecraft.Client\xbox\network\extra.h" +#include "../Minecraft.Client/Xbox/Network/extra.h" #endif #include "Definitions.h" @@ -173,6 +177,11 @@ void MemSect(int sect); #include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Render.h" #include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Storage.h" #include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Input.h" +#elif defined __linux__ +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h" +#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h" #else #include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Profile.h" #include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Render.h" @@ -180,25 +189,25 @@ void MemSect(int sect); #include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Input.h" #endif -#include "..\Minecraft.Client\Common\Network\GameNetworkManager.h" +#include "../Minecraft.Client/Common/Network/GameNetworkManager.h" // #ifdef _XBOX -#include "..\Minecraft.Client\Common\UI\UIEnums.h" -#include "..\Minecraft.Client\Common\App_defines.h" -#include "..\Minecraft.Client\Common\App_enums.h" -#include "..\Minecraft.Client\Common\Tutorial\TutorialEnum.h" -#include "..\Minecraft.Client\Common\App_structs.h" +#include "../Minecraft.Client/Common/UI/UIEnums.h" +#include "../Minecraft.Client/Common/App_Defines.h" +#include "../Minecraft.Client/Common/App_enums.h" +#include "../Minecraft.Client/Common/Tutorial/TutorialEnum.h" +#include "../Minecraft.Client/Common/App_structs.h" //#endif #ifdef _XBOX #include "..\Minecraft.Client\Common\XUI\XUI_Helper.h" #include "..\Minecraft.Client\Common\XUI\XUI_Scene_Base.h" #endif -#include "..\Minecraft.Client\Common\Consoles_App.h" -#include "..\Minecraft.Client\Common\Minecraft_Macros.h" -#include "..\Minecraft.Client\Common\Colours\ColourTable.h" +#include "../Minecraft.Client/Common/Consoles_App.h" +#include "../Minecraft.Client/Common/Minecraft_Macros.h" +#include "../Minecraft.Client/Common/Colours/ColourTable.h" -#include "..\Minecraft.Client\Common\BuildVer.h" +#include "../Minecraft.Client/Common/BuildVer.h" #ifdef _XBOX #include "..\Minecraft.Client\Xbox\Xbox_App.h" @@ -231,6 +240,8 @@ void MemSect(int sect); #include "..\Minecraft.Client\PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this #include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h" #include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h" +#elif defined(__linux__) +// DecalOverdose: TODO???? #else #include "..\Minecraft.Client\Orbis\Orbis_App.h" #include "..\Minecraft.Client\OrbisMedia\strings.h" @@ -238,10 +249,10 @@ void MemSect(int sect); #include "..\Minecraft.Client\Orbis\Sentient\MinecraftTelemetry.h" #endif -#include "..\Minecraft.Client\Common\DLC\DLCSkinFile.h" -#include "..\Minecraft.Client\Common\Console_Awards_enum.h" -#include "..\Minecraft.Client\Common\Potion_Macros.h" -#include "..\Minecraft.Client\Common\Console_Debug_enum.h" -#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRulesConstants.h" -#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRules.h" -#include "..\Minecraft.Client\Common\Telemetry\TelemetryManager.h" +#include "../Minecraft.Client/Common/DLC/DLCSkinFile.h" +#include "../Minecraft.Client/Common/Console_Awards_enum.h" +#include "../Minecraft.Client/Common/Potion_Macros.h" +#include "../Minecraft.Client/Common/Console_Debug_enum.h" +#include "../Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h" +#include "../Minecraft.Client/Common/GameRules/ConsoleGameRules.h" +#include "../Minecraft.Client/Common/Telemetry/TelemetryManager.h"