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
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "PSVitaLeaderboardManager.h"
|
||||
|
||||
#include "PSVita\PSVita_App.h"
|
||||
#include "PSVita\PSVitaExtras\ShutdownManager.h"
|
||||
#include "PSVita/PSVita_App.h"
|
||||
#include "PSVita/PSVitaExtras/ShutdownManager.h"
|
||||
|
||||
#include "Common\Consoles_App.h"
|
||||
#include "Common\Network\Sony\SQRNetworkManager.h"
|
||||
#include "Common/Consoles_App.h"
|
||||
#include "Common/Network/Sony/SQRNetworkManager.h"
|
||||
|
||||
#include "..\..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "../../../Minecraft.World/StringHelpers.h"
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common\Leaderboards\SonyLeaderboardManager.h"
|
||||
#include "Common\Leaderboards\LeaderboardManager.h"
|
||||
#include "Common/Leaderboards/SonyLeaderboardManager.h"
|
||||
#include "Common/Leaderboards/LeaderboardManager.h"
|
||||
|
||||
#include "Conf.h"
|
||||
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include <pspnet_adhoc.h>
|
||||
#include <adhoc_matching.h>
|
||||
|
||||
#include "PSVita\PSVitaExtras\Conf.h"
|
||||
#include "Common\Network\Sony\SonyHttp.h"
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "PSVita/PSVitaExtras/Conf.h"
|
||||
#include "Common/Network/Sony/SonyHttp.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
|
||||
|
||||
#define MATCHING_PORT (1)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
|
||||
#include "../../Common/Network/Sony/SQRNetworkManager.h"
|
||||
//
|
||||
class SQRNetworkPlayer;
|
||||
class ISQRNetworkManagerListener;
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
#include <libnetctl.h>
|
||||
#include <netcheck_dialog.h>
|
||||
|
||||
#include "PSVita\PSVitaExtras\Conf.h"
|
||||
#include "Common\Network\Sony\SonyHttp.h"
|
||||
#include "..\..\..\Minecraft.World\C4JThread.h"
|
||||
#include "PSVita/PSVitaExtras/Conf.h"
|
||||
#include "Common/Network/Sony/SonyHttp.h"
|
||||
#include "../../../Minecraft.World/C4JThread.h"
|
||||
|
||||
// image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K )
|
||||
#define SESSION_IMAGE_PATH "app0:PSVita/session_image.png"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
|
||||
#include "../../Common/Network/Sony/SQRNetworkManager.h"
|
||||
|
||||
class SQRNetworkPlayer;
|
||||
class ISQRNetworkManagerListener;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "Common\Network\Sony\SonyCommerce.h"
|
||||
#include "Common/Network/Sony/SonyCommerce.h"
|
||||
#include <np_toolkit.h>
|
||||
#include <libsysmodule.h>
|
||||
#include <netcheck_dialog.h>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include "Common\Network\Sony\SonyRemoteStorage.h"
|
||||
#include "Common/Network/Sony/SonyRemoteStorage.h"
|
||||
|
||||
class SonyRemoteStorage_Vita : public SonyRemoteStorage
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "ShutdownManager.h"
|
||||
#include "..\..\Common\Leaderboards\LeaderboardManager.h"
|
||||
#include "..\..\MinecraftServer.h"
|
||||
#include "../../Common/Leaderboards/LeaderboardManager.h"
|
||||
#include "../../MinecraftServer.h"
|
||||
#ifdef __PS3__
|
||||
#include "C4JSpursJob.h"
|
||||
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
|
||||
#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 "..\..\Minecraft.World\StringHelpers.h"
|
||||
#include "PSVita\Network\SonyRemoteStorage_Vita.h"
|
||||
#include "PSVita\Network\SonyCommerce_Vita.h"
|
||||
#include "..\..\Common\Network\Sony\SonyRemoteStorage.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 "../../Minecraft.World/StringHelpers.h"
|
||||
#include "PSVita/Network/SonyRemoteStorage_Vita.h"
|
||||
#include "PSVita/Network/SonyCommerce_Vita.h"
|
||||
#include "../../Common/Network/Sony/SonyRemoteStorage.h"
|
||||
#include "PSVita/Network/PSVita_NPToolkit.h"
|
||||
#include <message_dialog.h>
|
||||
#include <savedata_dialog.h>
|
||||
#include "Common\UI\UI.h"
|
||||
#include "PSVita\PSVitaExtras\PSVitaStrings.h"
|
||||
#include "Common/UI/UI.h"
|
||||
#include "PSVita/PSVitaExtras/PSVitaStrings.h"
|
||||
|
||||
#define VITA_COMMERCE_ENABLED
|
||||
CConsoleMinecraftApp app;
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
class C4JStringTable;
|
||||
//#include <np_toolkit.h>
|
||||
|
||||
#include "..\..\Common\Network\Sony\SonyCommerce.h"
|
||||
#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
|
||||
#include "../../Common/Network/Sony/SonyCommerce.h"
|
||||
#include "../../Common/Network/Sony/SonyRemoteStorage.h"
|
||||
|
||||
#define PRODUCT_CODE_SIZE 9
|
||||
#define SAVEFOLDERPREFIX_SIZE 10
|
||||
|
||||
@@ -3,64 +3,64 @@
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "Leaderboards\PSVitaLeaderboardManager.h"
|
||||
#include "PSVita\PSVitaExtras\ShutdownManager.h"
|
||||
#include "Leaderboards/PSVitaLeaderboardManager.h"
|
||||
#include "PSVita/PSVitaExtras/ShutdownManager.h"
|
||||
|
||||
//#define HEAPINSPECTOR_PS3 1
|
||||
// when defining HEAPINSPECTOR_PS3, add this line to the linker settings
|
||||
// --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign --wrap _malloc_init
|
||||
|
||||
#if HEAPINSPECTOR_PS3
|
||||
#include "HeapInspector\Server\HeapInspectorServer.h"
|
||||
#include "HeapInspector\Server\PS3\HeapHooks.hpp"
|
||||
#include "HeapInspector/Server/HeapInspectorServer.h"
|
||||
#include "HeapInspector/Server/PS3/HeapHooks.hpp"
|
||||
#endif
|
||||
|
||||
//#define DISABLE_MILES_SOUND
|
||||
|
||||
#include "PSVita_App.h"
|
||||
#include "PSVitaExtras\PSVitaStrings.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 "PSVitaExtras/PSVitaStrings.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 "..\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 "../ClientConnection.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 "..\Common\Console_Awards_enum.h"
|
||||
#include "..\..\Minecraft.Client\Options.h"
|
||||
#include "..\GameRenderer.h"
|
||||
#include "Sentient\SentientManager.h"
|
||||
#include "..\..\Minecraft.World\IntCache.h"
|
||||
#include "..\Textures.h"
|
||||
#include "../../Minecraft.Client/Tesselator.h"
|
||||
#include "../Common/Console_Awards_enum.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 "PS3\PS3Extras\EdgeZLib.h"
|
||||
#include "..\..\Minecraft.World\C4JThread.h"
|
||||
#include "Common\Network\Sony\SQRNetworkManager.h"
|
||||
#include "Common\UI\IUIScene_PauseMenu.h"
|
||||
#include "../../Minecraft.World/compression.h"
|
||||
#include "../../Minecraft.World/OldChunkStorage.h"
|
||||
//#include "PS3/PS3Extras/EdgeZLib.h"
|
||||
#include "../../Minecraft.World/C4JThread.h"
|
||||
#include "Common/Network/Sony/SQRNetworkManager.h"
|
||||
#include "Common/UI/IUIScene_PauseMenu.h"
|
||||
#include "Conf.h"
|
||||
#include "PSVita/Network/PSVita_NPToolkit.h"
|
||||
#include "PSVita\Network\SonyVoiceChat_Vita.h"
|
||||
#include "..\..\Minecraft.World\FireworksRecipe.h"
|
||||
#include "PSVita/Network/SonyVoiceChat_Vita.h"
|
||||
#include "../../Minecraft.World/FireworksRecipe.h"
|
||||
|
||||
#include <libsysmodule.h>
|
||||
#include <libperf.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "PSVita_PlayerUID.h"
|
||||
#include "..\Minecraft.World\StringHelpers.h"
|
||||
#include "../Minecraft.World/StringHelpers.h"
|
||||
|
||||
// taken from Boost, there is no TR1 equivalent
|
||||
template <class T>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "PSVita_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