fix: compile errors
This commit is contained in:
1 parent
1e763528bd
commit
3c3332bdd4
5 files changed
+18
-160
No files matched your search
@@ -21,6 +21,10 @@
|
||||
/Minecraft.World/*Release*
|
||||
/Minecraft.World/*ContentPackage*
|
||||
|
||||
# Build Folders
|
||||
*/Build/*
|
||||
Build/*
|
||||
|
||||
# PS3 SPU Tasks
|
||||
/Minecraft.Client/PS3/SPU_Tasks/objFiles
|
||||
/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
|
||||
|
||||
Binary file not shown.
@@ -6003,22 +6003,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SkinSelectMenu.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_TeleportMenu.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
@@ -23019,54 +23003,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsAudioMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsControlMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsGraphicsMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
@@ -23083,38 +23019,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsOptionsMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsUIMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SignEntryMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
@@ -23131,22 +23035,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SkinSelectMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_TeleportMenu.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
|
||||
|
||||
@@ -3015,9 +3015,6 @@
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsOptionsMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIControl.h">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClInclude>
|
||||
@@ -3045,18 +3042,6 @@
|
||||
<ClInclude Include="Common\UI\UIControl_Progress.h">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsAudioMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsControlMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsGraphicsMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SettingsUIMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\Network\PlatformNetworkManagerInterface.h">
|
||||
<Filter>Common\Source Files\Network</Filter>
|
||||
</ClInclude>
|
||||
@@ -3105,9 +3090,6 @@
|
||||
<ClInclude Include="Common\BuildVer.h">
|
||||
<Filter>Common\Source Files\BuildVer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIScene_SkinSelectMenu.h">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\UI\UIControl_PlayerSkinPreview.h">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClInclude>
|
||||
@@ -5096,9 +5078,6 @@
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsOptionsMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIControl.cpp">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClCompile>
|
||||
@@ -5126,18 +5105,6 @@
|
||||
<ClCompile Include="Common\UI\UIControl_Progress.cpp">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsAudioMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsControlMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsGraphicsMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SettingsUIMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\IUIScene_CraftingMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\All Platforms</Filter>
|
||||
</ClCompile>
|
||||
@@ -5180,9 +5147,6 @@
|
||||
<ClCompile Include="Common\UI\UIScene_ConnectingProgress.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIScene_SkinSelectMenu.cpp">
|
||||
<Filter>Common\Source Files\UI\Scenes\Help & Options</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\UI\UIControl_PlayerSkinPreview.cpp">
|
||||
<Filter>Common\Source Files\UI\Controls</Filter>
|
||||
</ClCompile>
|
||||
|
||||
+14
-12
@@ -98,18 +98,9 @@ typedef XUID PlayerUID;
|
||||
typedef XNKID SessionID;
|
||||
typedef XUID GameSessionUID;
|
||||
#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
|
||||
#endif
|
||||
|
||||
#ifndef _XBOX
|
||||
#include "Xbox\GameConfig\Minecraft.spa.h"
|
||||
#include "Common\Audio\SoundEngine.h"
|
||||
#include "extraX64client.h"
|
||||
#else
|
||||
#include "..\Minecraft.Client\xbox\network\extra.h"
|
||||
#include "Xbox\Audio\SoundEngine.h"
|
||||
#else
|
||||
#include "extraX64.h"
|
||||
#include <xonline.h>
|
||||
#include <xparty.h>
|
||||
#endif
|
||||
|
||||
#ifdef __PS3__
|
||||
@@ -151,6 +142,8 @@ typedef XUID GameSessionUID;
|
||||
#include "..\Minecraft.World\PerformanceTimer.h"
|
||||
|
||||
#ifdef _XBOX
|
||||
#include <xonline.h>
|
||||
#include <xparty.h>
|
||||
#include "xbox\4JLibs\inc\4J_Input.h"
|
||||
#include "xbox\4JLibs\inc\4J_Profile.h"
|
||||
#include "xbox\4JLibs\inc\4J_Render.h"
|
||||
@@ -201,9 +194,9 @@ typedef XUID GameSessionUID;
|
||||
#include "Common\XUI\XUI_Scene_Base.h"
|
||||
#endif
|
||||
|
||||
#include "Common\App_defines.h"
|
||||
#include "Common\UI\UIEnums.h"
|
||||
#include "Common\UI\UIStructs.h"
|
||||
#include "Common\App_defines.h"
|
||||
#include "Common\App_enums.h"
|
||||
#include "Common\Tutorial\TutorialEnum.h"
|
||||
#include "Common\App_structs.h"
|
||||
@@ -213,6 +206,16 @@ typedef XUID GameSessionUID;
|
||||
#include "Common\Minecraft_Macros.h"
|
||||
#include "Common\BuildVer.h"
|
||||
|
||||
#ifndef _XBOX
|
||||
#include "Xbox\GameConfig\Minecraft.spa.h"
|
||||
#include "Common\Audio\SoundEngine.h"
|
||||
#ifndef __PS3__
|
||||
#include "extraX64client.h"
|
||||
#endif
|
||||
#else
|
||||
#include "Xbox\Audio\SoundEngine.h"
|
||||
#endif
|
||||
|
||||
#ifdef _XBOX
|
||||
#include "Xbox\Xbox_App.h"
|
||||
#include "Xbox\Sentient\MinecraftTelemetry.h"
|
||||
@@ -260,7 +263,6 @@ typedef XUID GameSessionUID;
|
||||
#include "Windows64\Sentient\SentientTelemetryCommon.h"
|
||||
#include "Windows64\XML\ATGXmlParser.h"
|
||||
#include "Windows64\Social\SocialManager.h"
|
||||
#include "Common\Audio\SoundEngine.h"
|
||||
#include "Windows64\Iggy\include\iggy.h"
|
||||
#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
|
||||
#include "Windows64\Windows64_UIController.h"
|
||||
|
||||
Reference in new issue
Block a user