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:
@@ -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 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common\Leaderboards\LeaderboardManager.h"
|
||||
#include "Common/Leaderboards/LeaderboardManager.h"
|
||||
|
||||
class WindowsLeaderboardManager : public LeaderboardManager
|
||||
{
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
#ifdef _WINDOWS64
|
||||
|
||||
#include "WinsockNetLayer.h"
|
||||
#include "..\..\Common\Network\PlatformNetworkManagerStub.h"
|
||||
#include "..\..\..\Minecraft.World\Socket.h"
|
||||
#include "../../Common/Network/PlatformNetworkManagerStub.h"
|
||||
#include "../../../Minecraft.World/Socket.h"
|
||||
#if defined(MINECRAFT_SERVER_BUILD)
|
||||
#include "..\..\..\Minecraft.Server\Access\Access.h"
|
||||
#include "..\..\..\Minecraft.Server\ServerLogManager.h"
|
||||
#include "../../../Minecraft.Server/Access/Access.h"
|
||||
#include "../../../Minecraft.Server/ServerLogManager.h"
|
||||
#endif
|
||||
#include "..\..\..\Minecraft.World\DisconnectPacket.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\4JLibs\inc\4J_Profile.h"
|
||||
#include "../../../Minecraft.World/DisconnectPacket.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../4JLibs/inc/4J_Profile.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <WinSock2.h>
|
||||
#include <WS2tcpip.h>
|
||||
#include <vector>
|
||||
#include "..\..\Common\Network\NetworkPlayerInterface.h"
|
||||
#include "../../Common/Network/NetworkPlayerInterface.h"
|
||||
|
||||
#pragma comment(lib, "Ws2_32.lib")
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\Common\PostProcesser.h"
|
||||
#include "../Common/PostProcesser.h"
|
||||
#include <d3dcompiler.h>
|
||||
#include <vector>
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#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 "../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"
|
||||
|
||||
CConsoleMinecraftApp app;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "4JLibs\inc\4J_Render.h"
|
||||
#include "4JLibs/inc/4J_Render.h"
|
||||
|
||||
class CConsoleMinecraftApp : public CMinecraftApp
|
||||
{
|
||||
|
||||
@@ -7,46 +7,46 @@
|
||||
#include <iostream>
|
||||
#include <ShellScalingApi.h>
|
||||
#include <shellapi.h>
|
||||
#include "GameConfig\Minecraft.spa.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 "GameConfig/Minecraft.spa.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 "..\ClientConnection.h"
|
||||
#include "..\Minecraft.h"
|
||||
#include "..\ChatScreen.h"
|
||||
#include "../ClientConnection.h"
|
||||
#include "../Minecraft.h"
|
||||
#include "../ChatScreen.h"
|
||||
#include "KeyboardMouseInput.h"
|
||||
#include "..\User.h"
|
||||
#include "..\..\Minecraft.World\Socket.h"
|
||||
#include "..\..\Minecraft.World\ThreadName.h"
|
||||
#include "..\..\Minecraft.Client\StatsCounter.h"
|
||||
#include "..\ConnectScreen.h"
|
||||
//#include "Social\SocialManager.h"
|
||||
//#include "Leaderboards\LeaderboardManager.h"
|
||||
//#include "XUI\XUI_Scene_Container.h"
|
||||
#include "../User.h"
|
||||
#include "../../Minecraft.World/Socket.h"
|
||||
#include "../../Minecraft.World/ThreadName.h"
|
||||
#include "../../Minecraft.Client/StatsCounter.h"
|
||||
#include "../ConnectScreen.h"
|
||||
//#include "Social/SocialManager.h"
|
||||
//#include "Leaderboards/LeaderboardManager.h"
|
||||
//#include "XUI/XUI_Scene_Container.h"
|
||||
//#include "NetworkManager.h"
|
||||
#include "..\..\Minecraft.Client\Tesselator.h"
|
||||
#include "..\..\Minecraft.Client\Options.h"
|
||||
#include "..\Gui.h"
|
||||
#include "Sentient\SentientManager.h"
|
||||
#include "..\..\Minecraft.World\IntCache.h"
|
||||
#include "..\Textures.h"
|
||||
#include "..\Settings.h"
|
||||
#include "../../Minecraft.Client/Tesselator.h"
|
||||
#include "../../Minecraft.Client/Options.h"
|
||||
#include "../Gui.h"
|
||||
#include "Sentient/SentientManager.h"
|
||||
#include "../../Minecraft.World/IntCache.h"
|
||||
#include "../Textures.h"
|
||||
#include "../Settings.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 "Common/PostProcesser.h"
|
||||
#include "..\GameRenderer.h"
|
||||
#include "Network\WinsockNetLayer.h"
|
||||
#include "../GameRenderer.h"
|
||||
#include "Network/WinsockNetLayer.h"
|
||||
#include "Windows64_Xuid.h"
|
||||
#include "Common/UI/UI.h"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
class Renderer;
|
||||
extern Renderer InternalRenderManager;
|
||||
|
||||
#include "Xbox/resource.h"
|
||||
#include "Xbox/Resource.h"
|
||||
|
||||
// request use of dedicated GPU from AMD and Nvidia drivers
|
||||
extern "C"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "Windows64_UIController.h"
|
||||
|
||||
// Temp
|
||||
#include "..\Minecraft.h"
|
||||
#include "..\Textures.h"
|
||||
#include "../Minecraft.h"
|
||||
#include "../Textures.h"
|
||||
|
||||
#define _ENABLEIGGY
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\Common\UI\UIController.h"
|
||||
#include "../Common/UI/UIController.h"
|
||||
|
||||
class ConsoleUIController : public UIController
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user