major: Switch to forward slashes(+more) to fix compilation on Linux (#1403)
Notably also adds some metadata files for NixOS * add support for linux clang cross compiles * add linux clang instructions * un-capitalize Mob.horse.* * update the description in flake.nix --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -1,49 +1,49 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "..\..\..\Minecraft.World\AABB.h"
|
||||
#include "..\..\..\Minecraft.World\Vec3.h"
|
||||
#include "..\..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\..\Minecraft.World\ThreadName.h"
|
||||
#include "..\..\..\Minecraft.World\Entity.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\..\..\Minecraft.World\FireworksRecipe.h"
|
||||
#include "..\..\ClientConnection.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\User.h"
|
||||
#include "..\..\MinecraftServer.h"
|
||||
#include "..\..\PlayerList.h"
|
||||
#include "..\..\ServerPlayer.h"
|
||||
#include "..\..\PlayerConnection.h"
|
||||
#include "..\..\MultiPlayerLevel.h"
|
||||
#include "..\..\ProgressRenderer.h"
|
||||
#include "..\..\MultiPlayerLocalPlayer.h"
|
||||
#include "..\..\..\Minecraft.World\DisconnectPacket.h"
|
||||
#include "..\..\..\Minecraft.World\compression.h"
|
||||
#include "..\..\..\Minecraft.World\OldChunkStorage.h"
|
||||
#include "..\..\TexturePackRepository.h"
|
||||
#include "..\..\TexturePack.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
#include "../../../Minecraft.World/AABB.h"
|
||||
#include "../../../Minecraft.World/Vec3.h"
|
||||
#include "../../../Minecraft.World/Socket.h"
|
||||
#include "../../../Minecraft.World/ThreadName.h"
|
||||
#include "../../../Minecraft.World/Entity.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/FireworksRecipe.h"
|
||||
#include "../../ClientConnection.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../User.h"
|
||||
#include "../../MinecraftServer.h"
|
||||
#include "../../PlayerList.h"
|
||||
#include "../../ServerPlayer.h"
|
||||
#include "../../PlayerConnection.h"
|
||||
#include "../../MultiPlayerLevel.h"
|
||||
#include "../../ProgressRenderer.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "../../../Minecraft.World/DisconnectPacket.h"
|
||||
#include "../../../Minecraft.World/compression.h"
|
||||
#include "../../../Minecraft.World/OldChunkStorage.h"
|
||||
#include "../../TexturePackRepository.h"
|
||||
#include "../../TexturePack.h"
|
||||
|
||||
#include "..\..\Gui.h"
|
||||
#include "..\..\LevelRenderer.h"
|
||||
#include "..\..\..\Minecraft.World\IntCache.h"
|
||||
#include "..\GameRules\ConsoleGameRules.h"
|
||||
#include "../../Gui.h"
|
||||
#include "../../LevelRenderer.h"
|
||||
#include "../../../Minecraft.World/IntCache.h"
|
||||
#include "../GameRules/ConsoleGameRules.h"
|
||||
#include "GameNetworkManager.h"
|
||||
|
||||
#ifdef _XBOX
|
||||
#include "Common\XUI\XUI_PauseMenu.h"
|
||||
#include "Common/XUI/XUI_PauseMenu.h"
|
||||
#else
|
||||
#include "Common\UI\UI.h"
|
||||
#include "Common\UI\UIScene_PauseMenu.h"
|
||||
#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
|
||||
#include "Common/UI/UI.h"
|
||||
#include "Common/UI/UIScene_PauseMenu.h"
|
||||
#include "../../Xbox/Network/NetworkPlayerXbox.h"
|
||||
#endif
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#ifdef _WINDOWS64
|
||||
#include "..\..\Windows64\Network\WinsockNetLayer.h"
|
||||
#include "..\..\Windows64\Windows64_Xuid.h"
|
||||
#include "../../Windows64/Network/WinsockNetLayer.h"
|
||||
#include "../../Windows64/Windows64_Xuid.h"
|
||||
#endif
|
||||
|
||||
// Global instance
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
using namespace std;
|
||||
#include <vector>
|
||||
#include <qnet.h>
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
#include "NetworkPlayerInterface.h"
|
||||
#ifdef _XBOX
|
||||
#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
|
||||
#include "../../Xbox/Network/PlatformNetworkManagerXbox.h"
|
||||
#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
|
||||
#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
|
||||
#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h"
|
||||
#elif defined _DURANGO
|
||||
#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
|
||||
#include "../../Durango/Network/PlatformNetworkManagerDurango.h"
|
||||
#else
|
||||
#include "PlatformNetworkManagerStub.h"
|
||||
#endif
|
||||
#include "SessionInfo.h"
|
||||
|
||||
#ifdef __ORBIS__
|
||||
#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
|
||||
#include "../../Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
|
||||
#endif
|
||||
|
||||
class ClientConnection;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
using namespace std;
|
||||
#include <vector>
|
||||
#include <qnet.h>
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
#include "NetworkPlayerInterface.h"
|
||||
#include "SessionInfo.h"
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "../../../Minecraft.World/Socket.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
#include "PlatformNetworkManagerStub.h"
|
||||
#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
|
||||
#include "../../Xbox/Network/NetworkPlayerXbox.h"
|
||||
#ifdef _WINDOWS64
|
||||
#include "..\..\Windows64\Network\WinsockNetLayer.h"
|
||||
#include "..\..\Windows64\Windows64_Xuid.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\User.h"
|
||||
#include "..\..\MinecraftServer.h"
|
||||
#include "..\..\PlayerList.h"
|
||||
#include "../../Windows64/Network/WinsockNetLayer.h"
|
||||
#include "../../Windows64/Windows64_Xuid.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../User.h"
|
||||
#include "../../MinecraftServer.h"
|
||||
#include "../../PlayerList.h"
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
using namespace std;
|
||||
#include <vector>
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
#include "NetworkPlayerInterface.h"
|
||||
#include "PlatformNetworkManagerInterface.h"
|
||||
#include "SessionInfo.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#if defined(__PS3__) || defined(__ORBIS__)
|
||||
#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
|
||||
#include "../../Common/Network/Sony/SQRNetworkManager.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\..\Common\Network\NetworkPlayerInterface.h"
|
||||
#include "../../Common/Network/NetworkPlayerInterface.h"
|
||||
#include "SQRNetworkPlayer.h"
|
||||
|
||||
// This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "../../../Minecraft.World/Socket.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
#include "PlatformNetworkManagerSony.h"
|
||||
#include "NetworkPlayerSony.h"
|
||||
#include "..\..\Common\Network\GameNetworkManager.h"
|
||||
#include "../../Common/Network/GameNetworkManager.h"
|
||||
|
||||
CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
using namespace std;
|
||||
#include <vector>
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "..\..\Common\Network\NetworkPlayerInterface.h"
|
||||
#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
|
||||
#include "..\..\Common\Network\SessionInfo.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
#include "../../Common/Network/NetworkPlayerInterface.h"
|
||||
#include "../../Common/Network/PlatformNetworkManagerInterface.h"
|
||||
#include "../../Common/Network/SessionInfo.h"
|
||||
#include "SQRNetworkPlayer.h"
|
||||
|
||||
// This is how often we allow a search for new games
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <unordered_map>
|
||||
#if defined __PSVITA__
|
||||
#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
|
||||
#include "../../Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h"
|
||||
#endif
|
||||
|
||||
class SQRNetworkPlayer;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "SonyCommerce.h"
|
||||
#include "..\PS3Extras\ShutdownManager.h"
|
||||
#include "../PS3Extras/ShutdownManager.h"
|
||||
#include <sys/event.h>
|
||||
|
||||
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
|
||||
|
||||
#ifdef __PS3__
|
||||
#include "PS3\Network\SonyHttp_PS3.h"
|
||||
#include "PS3/Network/SonyHttp_PS3.h"
|
||||
SonyHttp_PS3 g_SonyHttp;
|
||||
|
||||
#elif defined __ORBIS__
|
||||
#include "Orbis\Network\SonyHttp_Orbis.h"
|
||||
#include "Orbis/Network/SonyHttp_Orbis.h"
|
||||
SonyHttp_Orbis g_SonyHttp;
|
||||
|
||||
#elif defined __PSVITA__
|
||||
#include "PSVita\Network\SonyHttp_Vita.h"
|
||||
#include "PSVita/Network/SonyHttp_Vita.h"
|
||||
SonyHttp_Vita g_SonyHttp;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
|
||||
#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
|
||||
|
||||
class SonyRemoteStorage
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user