Merge branch 'main' into networking

Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1

@@ -127,7 +127,14 @@ if (-not (Test-Path $genGp4)) {
     Write-Host "Orbis Postbuild: '$pkgSrc' not found, skipping PKG creation."
 } else {
     Write-Host "Orbis Postbuild: Generating GP4..."
-    & $genGp4 $pkgSrc
+    $proc = Start-Process -FilePath $genGp4 -ArgumentList $pkgSrc `
+        -WorkingDirectory (Split-Path $pkgSrc -Parent) `
+        -NoNewWindow -Wait -PassThru
+
+    if ($proc.ExitCode -ne 0) {
+        Write-Host "Orbis Postbuild ERROR: gengp4_app.exe failed with exit code $($proc.ExitCode)"
+        return
+    }
 
     if (-not (Test-Path $gp4File)) {
         Write-Host "Orbis Postbuild ERROR: $gp4File was not created"

Minecraft.Client/Minecraft.Client.vcxproj

@@ -520,24 +520,32 @@
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <LinkIncremental>false</LinkIncremental>
@@ -705,6 +713,9 @@
     <PostBuildEvent>
       <Message>Run Xbox postbuild script</Message>
     </PostBuildEvent>
+    <Deploy>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </Deploy>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <ClCompile>
@@ -2044,7 +2055,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OptimizationLevel>Level2</OptimizationLevel>
       <AdditionalIncludeDirectories>Orbis\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>