add support for linux clang cross compiles
This commit is contained in:
@@ -1,24 +1,24 @@
|
||||
#pragma once
|
||||
|
||||
#include "..\..\..\Minecraft.World\SoundTypes.h"
|
||||
#include "../../../Minecraft.World/SoundTypes.h"
|
||||
|
||||
#ifdef _XBOX
|
||||
|
||||
#elif defined (__PS3__)
|
||||
#undef __in
|
||||
#undef __out
|
||||
#include "..\..\PS3\Miles\include\mss.h"
|
||||
#include "../../PS3/Miles/include/mss.h"
|
||||
#elif defined (__PSVITA__)
|
||||
#include "..\..\PSVITA\Miles\include\mss.h"
|
||||
#include "../../PSVITA/Miles/include/mss.h"
|
||||
#elif defined _DURANGO
|
||||
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
|
||||
#define _SEKRIT
|
||||
#include "..\..\Durango\Miles\include\mss.h"
|
||||
#include "../../Durango/Miles/include/mss.h"
|
||||
#elif defined _WINDOWS64
|
||||
#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
|
||||
#include "..\..\Orbis\Miles\include\mss.h"
|
||||
#include "../../Orbis/Miles/include/mss.h"
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "SoundEngine.h"
|
||||
#include "..\Consoles_App.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\Minecraft.World\leveldata.h"
|
||||
#include "..\..\Minecraft.World\mth.h"
|
||||
#include "..\..\TexturePackRepository.h"
|
||||
#include "..\..\DLCTexturePack.h"
|
||||
#include "..\..\MultiPlayerGameMode.h"
|
||||
#include "..\..\Minecraft.World\LevelSettings.h"
|
||||
#include "Common\DLC\DLCAudioFile.h"
|
||||
#include "../Consoles_App.h"
|
||||
#include "../../MultiplayerLocalPlayer.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../Minecraft.World/leveldata.h"
|
||||
#include "../../Minecraft.World/mth.h"
|
||||
#include "../../TexturePackRepository.h"
|
||||
#include "../../DLCTexturePack.h"
|
||||
#include "../../MultiPlayerGameMode.h"
|
||||
#include "../../Minecraft.World/LevelSettings.h"
|
||||
#include "Common/DLC/DLCAudioFile.h"
|
||||
|
||||
#ifdef __PSVITA__
|
||||
#include <audioout.h>
|
||||
#endif
|
||||
|
||||
#include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
|
||||
#include "../../Minecraft.Client/Windows64/Windows64_App.h"
|
||||
|
||||
#include "stb_vorbis.h"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <lce_filesystem\lce_filesystem.h>
|
||||
#include <lce_filesystem/lce_filesystem.h>
|
||||
|
||||
#ifdef __ORBIS__
|
||||
#include <audioout.h>
|
||||
|
||||
@@ -187,28 +187,28 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
|
||||
|
||||
L"liquid.swim", //eSoundType_LIQUID_SWIM,
|
||||
|
||||
L"mob.horse.land", //eSoundType_MOB_HORSE_LAND,
|
||||
L"mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR,
|
||||
L"mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER,
|
||||
L"mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH,
|
||||
L"mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH,
|
||||
L"mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH,
|
||||
L"mob.horse.death", //eSoundType_MOB_HORSE_DEATH,
|
||||
L"mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT,
|
||||
L"mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT,
|
||||
L"mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT,
|
||||
L"mob.horse.hit", //eSoundType_MOB_HORSE_HIT,
|
||||
L"mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE,
|
||||
L"mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE,
|
||||
L"mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE,
|
||||
L"mob.horse.idle", //eSoundType_MOB_HORSE_IDLE,
|
||||
L"mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY,
|
||||
L"mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY,
|
||||
L"mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP,
|
||||
L"mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE,
|
||||
L"mob.horse.wood", //eSoundType_MOB_HORSE_WOOD,
|
||||
L"mob.horse.soft", //eSoundType_MOB_HORSE_SOFT,
|
||||
L"mob.horse.jump", //eSoundType_MOB_HORSE_JUMP,
|
||||
L"Mob.horse.land", //eSoundType_MOB_HORSE_LAND,
|
||||
L"Mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR,
|
||||
L"Mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER,
|
||||
L"Mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH,
|
||||
L"Mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH,
|
||||
L"Mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH,
|
||||
L"Mob.horse.death", //eSoundType_MOB_HORSE_DEATH,
|
||||
L"Mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT,
|
||||
L"Mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT,
|
||||
L"Mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT,
|
||||
L"Mob.horse.hit", //eSoundType_MOB_HORSE_HIT,
|
||||
L"Mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE,
|
||||
L"Mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE,
|
||||
L"Mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE,
|
||||
L"Mob.horse.idle", //eSoundType_MOB_HORSE_IDLE,
|
||||
L"Mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY,
|
||||
L"Mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY,
|
||||
L"Mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP,
|
||||
L"Mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE,
|
||||
L"Mob.horse.wood", //eSoundType_MOB_HORSE_WOOD,
|
||||
L"Mob.horse.soft", //eSoundType_MOB_HORSE_SOFT,
|
||||
L"Mob.horse.jump", //eSoundType_MOB_HORSE_JUMP,
|
||||
|
||||
L"mob.witch.ambient", //eSoundType_MOB_WITCH_IDLE,
|
||||
L"mob.witch.hurt", //eSoundType_MOB_WITCH_HURT,
|
||||
|
||||
Reference in New Issue
Block a user