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,17 +1,17 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\Common\Consoles_App.h"
|
||||
#include "..\User.h"
|
||||
#include "..\..\Minecraft.Client\Minecraft.h"
|
||||
#include "..\..\Minecraft.Client\MinecraftServer.h"
|
||||
#include "..\..\Minecraft.Client\PlayerList.h"
|
||||
#include "..\..\Minecraft.Client\ServerPlayer.h"
|
||||
#include "..\..\Minecraft.World\Level.h"
|
||||
#include "..\..\Minecraft.World\LevelSettings.h"
|
||||
#include "..\..\Minecraft.World\BiomeSource.h"
|
||||
#include "..\..\Minecraft.World\LevelType.h"
|
||||
#include "ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
|
||||
#include "..\..\Minecraft.World\DurangoStats.h"
|
||||
#include "..\..\Minecraft.Client\Durango\XML\xmlFilesCallback.h"
|
||||
#include "../Common/Consoles_App.h"
|
||||
#include "../User.h"
|
||||
#include "../../Minecraft.Client/Minecraft.h"
|
||||
#include "../../Minecraft.Client/MinecraftServer.h"
|
||||
#include "../../Minecraft.Client/PlayerList.h"
|
||||
#include "../../Minecraft.Client/ServerPlayer.h"
|
||||
#include "../../Minecraft.World/Level.h"
|
||||
#include "../../Minecraft.World/LevelSettings.h"
|
||||
#include "../../Minecraft.World/BiomeSource.h"
|
||||
#include "../../Minecraft.World/LevelType.h"
|
||||
#include "ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
|
||||
#include "../../Minecraft.World/DurangoStats.h"
|
||||
#include "../../Minecraft.Client/Durango/XML/xmlFilesCallback.h"
|
||||
#include "Common/UI/UI.h"
|
||||
|
||||
CConsoleMinecraftApp app;
|
||||
|
||||
@@ -4,36 +4,36 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include "..\MinecraftServer.h"
|
||||
#include "..\LocalPlayer.h"
|
||||
#include "..\..\Minecraft.World\ItemInstance.h"
|
||||
#include "..\..\Minecraft.World\MapItem.h"
|
||||
#include "..\..\Minecraft.World\Recipes.h"
|
||||
#include "..\..\Minecraft.World\Recipy.h"
|
||||
#include "..\..\Minecraft.World\Language.h"
|
||||
#include "..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "..\..\Minecraft.World\AABB.h"
|
||||
#include "..\..\Minecraft.World\Vec3.h"
|
||||
#include "..\..\Minecraft.World\Level.h"
|
||||
#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "../MinecraftServer.h"
|
||||
#include "../LocalPlayer.h"
|
||||
#include "../../Minecraft.World/ItemInstance.h"
|
||||
#include "../../Minecraft.World/MapItem.h"
|
||||
#include "../../Minecraft.World/Recipes.h"
|
||||
#include "../../Minecraft.World/Recipy.h"
|
||||
#include "../../Minecraft.World/Language.h"
|
||||
#include "../../Minecraft.World/StringHelpers.h"
|
||||
#include "../../Minecraft.World/AABB.h"
|
||||
#include "../../Minecraft.World/Vec3.h"
|
||||
#include "../../Minecraft.World/Level.h"
|
||||
#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
|
||||
#include "Leaderboards\GameProgress.h"
|
||||
#include "..\ClientConnection.h"
|
||||
#include "..\User.h"
|
||||
#include "..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\Minecraft.World\ThreadName.h"
|
||||
#include "..\..\Minecraft.Client\StatsCounter.h"
|
||||
#include "..\ConnectScreen.h"
|
||||
#include "Leaderboards\DurangoLeaderboardManager.h"
|
||||
#include "..\..\Minecraft.Client\Tesselator.h"
|
||||
#include "..\..\Minecraft.Client\Options.h"
|
||||
#include "..\GameRenderer.h"
|
||||
#include "Sentient\SentientManager.h"
|
||||
#include "..\..\Minecraft.World\IntCache.h"
|
||||
#include "..\Textures.h"
|
||||
#include "Leaderboards/GameProgress.h"
|
||||
#include "../ClientConnection.h"
|
||||
#include "../User.h"
|
||||
#include "../../Minecraft.World/Socket.h"
|
||||
#include "../../Minecraft.World/ThreadName.h"
|
||||
#include "../../Minecraft.Client/StatsCounter.h"
|
||||
#include "../ConnectScreen.h"
|
||||
#include "Leaderboards/DurangoLeaderboardManager.h"
|
||||
#include "../../Minecraft.Client/Tesselator.h"
|
||||
#include "../../Minecraft.Client/Options.h"
|
||||
#include "../GameRenderer.h"
|
||||
#include "Sentient/SentientManager.h"
|
||||
#include "../../Minecraft.World/IntCache.h"
|
||||
#include "../Textures.h"
|
||||
#include "Resource.h"
|
||||
#include "..\..\Minecraft.World\compression.h"
|
||||
#include "..\..\Minecraft.World\OldChunkStorage.h"
|
||||
#include "../../Minecraft.World/compression.h"
|
||||
#include "../../Minecraft.World/OldChunkStorage.h"
|
||||
#include <agile.h>
|
||||
|
||||
//using namespace Windows::Xbox::Input;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\Common\UI\UIController.h"
|
||||
#include "../Common/UI/UIController.h"
|
||||
|
||||
class ConsoleUIController : public UIController
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#ifndef __RAD_INCLUDE_GDRAW_H__
|
||||
#define __RAD_INCLUDE_GDRAW_H__
|
||||
|
||||
#include "rrcore.h"
|
||||
#include "rrCore.h"
|
||||
|
||||
#define IDOC
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#define IggyVersion "1.2.30"
|
||||
#define IggyFlashVersion "9,1,2,30"
|
||||
|
||||
#include "rrcore.h" // base data types, macros
|
||||
#include "rrCore.h" // base data types, macros
|
||||
|
||||
RADDEFSTART
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "DurangoLeaderboardManager.h"
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
|
||||
namespace WFC = Windows::Foundation::Collections;
|
||||
namespace CC = concurrency;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common\Leaderboards\LeaderboardManager.h"
|
||||
#include "Common/Leaderboards/LeaderboardManager.h"
|
||||
|
||||
namespace P = Platform;
|
||||
namespace PC = Platform::Collections;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "..\Minecraft.World\Tile.h"
|
||||
#include "..\Minecraft.World\Item.h"
|
||||
#include "../Minecraft.World/Tile.h"
|
||||
#include "../Minecraft.World/Item.h"
|
||||
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
|
||||
#include "..\Minecraft.World\EntityIO.h"
|
||||
#include "../Minecraft.World/EntityIO.h"
|
||||
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
|
||||
#include "Common\Console_Awards_enum.h"
|
||||
#include "Common/Console_Awards_enum.h"
|
||||
|
||||
#include "DurangoStatsDebugger.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
|
||||
#include "Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
|
||||
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
|
||||
#include "GameProgress.h"
|
||||
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <collection.h>
|
||||
#include <ppltasks.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
#include "base64.h"
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#include "ChatIntegrationLayer.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "DQRNetworkPlayer.h"
|
||||
#include "..\Minecraft.World\C4JThread.h"
|
||||
#include "../Minecraft.World/C4JThread.h"
|
||||
#include <collection.h>
|
||||
|
||||
class IDQRNetworkManagerListener;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <collection.h>
|
||||
#include <ppltasks.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
#include "base64.h"
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#include "ChatIntegrationLayer.h"
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <collection.h>
|
||||
#include <ppltasks.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
#include "base64.h"
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#include "ChatIntegrationLayer.h"
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <collection.h>
|
||||
#include <ppltasks.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
#include "base64.h"
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#include "ChatIntegrationLayer.h"
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <collection.h>
|
||||
#include <ppltasks.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
#include "base64.h"
|
||||
|
||||
#ifdef _DURANGO
|
||||
#include "..\Minecraft.World\DurangoStats.h"
|
||||
#include "../Minecraft.World/DurangoStats.h"
|
||||
#endif
|
||||
|
||||
#include "ChatIntegrationLayer.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\..\Common\Network\NetworkPlayerInterface.h"
|
||||
#include "../../Common/Network/NetworkPlayerInterface.h"
|
||||
#include "DQRNetworkPlayer.h"
|
||||
|
||||
// This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "../../../Minecraft.World/Socket.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
#include "PlatformNetworkManagerDurango.h"
|
||||
#include "NetworkPlayerDurango.h"
|
||||
|
||||
|
||||
@@ -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 "DQRNetworkManager.h"
|
||||
|
||||
#define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
|
||||
#include "..\Minecraft.World\Player.h"
|
||||
#include "..\Minecraft.World\Level.h"
|
||||
#include "..\Minecraft.World\LevelData.h"
|
||||
#include "..\Minecraft.World\LevelSettings.h"
|
||||
#include "../Minecraft.World/Player.h"
|
||||
#include "../Minecraft.World/Level.h"
|
||||
#include "../Minecraft.World/LevelData.h"
|
||||
#include "../Minecraft.World/LevelSettings.h"
|
||||
|
||||
#include "Common\Network\GameNetworkManager.h"
|
||||
#include "Common/Network/GameNetworkManager.h"
|
||||
#include "MultiPlayerLocalPlayer.h"
|
||||
|
||||
#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
|
||||
#include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
|
||||
|
||||
#include "DurangoTelemetry.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\..\..\Minecraft.World\DurangoStats.h"
|
||||
#include "../../../Minecraft.World/DurangoStats.h"
|
||||
|
||||
#include "..\..\Common\Telemetry\TelemetryManager.h"
|
||||
#include "../../Common/Telemetry/TelemetryManager.h"
|
||||
|
||||
class CDurangoTelemetryManager : public CTelemetryManager
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
//-------------------------------------------------------------------------------------
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "AtgXmlParser.h"
|
||||
#include "ATGXmlParser.h"
|
||||
|
||||
namespace ATG
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "XboxGameMode.h"
|
||||
#include "..\Common\Tutorial\Tutorial.h"
|
||||
#include "../Common/Tutorial/Tutorial.h"
|
||||
|
||||
XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
|
||||
: TutorialMode(iPad, minecraft, connection)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "..\Common\Tutorial\TutorialMode.h"
|
||||
#include "../Common/Tutorial/TutorialMode.h"
|
||||
|
||||
class XboxGameMode : public TutorialMode
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user