diff --git a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 index fd1aec5e..867a4268 100644 --- a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 @@ -6,13 +6,13 @@ param( Write-Host "Orbis Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir" $directories = @( - "music", - "Orbis", - "Common", - "Common\Media", - "Common\Tutorial", - "Common\res", - "Sound" + "PS4_GAME\music", + "PS4_GAME\Orbis", + "PS4_GAME\Common", + "PS4_GAME\Common\Media", + "PS4_GAME\Common\Tutorial", + "PS4_GAME\Common\res", + "PS4_GAME\Orbis\Sound" ) foreach ($dir in $directories) { @@ -27,7 +27,7 @@ $folderCopies = @( @{ Source = "PS3\Sound"; Dest = "PS4_GAME\Sound" }, @{ Source = "Common\Postbuilds\Contents\Orbis\sce_module"; Dest = "PS4_GAME\sce_module" }, @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" }, - @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }, + @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" } ) foreach ($copy in $folderCopies) { @@ -41,7 +41,7 @@ foreach ($copy in $folderCopies) { $fileCopies = @( @{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" }, - @{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }, + @{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" } ) foreach ($copy in $fileCopies) { diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp index 64bbecb6..c8d38e0b 100644 --- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp @@ -10,9 +10,6 @@ #include "..\..\TexturePack.h" #include "..\..\DLCTexturePack.h" #include "..\..\..\Minecraft.World\StringHelpers.h" -#if defined(__ORBIS__) -#include "..\..\OrbisMedia\strings.h" -#endif #ifndef _XBOX #include "UI.h" #endif diff --git a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp index cfa1e583..fc81ef22 100644 --- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp @@ -2,9 +2,6 @@ #include "UI.h" #include "UIComponent_PressStartToPlay.h" #include "..\..\..\Minecraft.World\StringHelpers.h" -#if defined(__ORBIS__) -#include "..\..\OrbisMedia\strings.h" -#endif UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { // Setup all the Iggy references we need for this scene diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index 29fc5be8..42ef73f5 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -23,10 +23,6 @@ #include "Xbox\Resource.h" #endif -#if defined(__ORBIS__) -#include "..\..\OrbisMedia\strings.h" -#endif - #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index bda9453c..108ecf8f 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -3068,6 +3068,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU false + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + + + Run Orbis postbuild script + @@ -3185,6 +3191,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU false + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + + + Run Orbis postbuild script +