fix(Orbis): preprocessor definitions

This fixes Orbis & PSVita builds along with adds a Durango postbuild and moves PS3 to the new SonyLeaderboardManager introduced in TU19

This also fixes the Orbis strings and gets some of the other Windows64 build configurations mostly building.

---------

Co-authored-by: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com>
Co-authored-by: str1k3r <1+str1k3r@noreply.localhost>
Co-authored-by: 552eden <552eden@gmail.com>
Co-authored-by: ubergamer-pie <16+ubergamer-pie@noreply.localhost>
Co-authored-by: str1k3r <15+str1k3r@noreply.neolegacy.dev>
Co-authored-by: pieeebot <10+pieeebot@noreply.neolegacy.dev>
Reviewed-on: pieeebot/cafeberry#10

.gitea/workflows/release.yaml

@@ -24,41 +24,58 @@ jobs:
           }
 
   build:
+    needs: validate
     runs-on: windows-2022
 
     strategy:
       matrix:
         configuration: [Release]
-        platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
+        platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
 
     steps:
       - name: Checkout Repository
         uses: https://github.com/actions/checkout@v4
+        with:
+          fetch-depth: 1
+          lfs: false 
 
       - name: Build Cafeberry
         run: |
+          $platform = if ("${{ matrix.platform }}" -eq "Xbox360") { "Xbox 360" } elseif ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" } else { "${{ matrix.platform }}" }
+
           & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
             /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=${{ matrix.platform }} `
+            "/p:Platform=$platform" `
             /m
 
-      - name: Zip Build (Consoles)
-        if: matrix.platform != 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
-
-      - name: Zip Build (Windows64)
-        if: matrix.platform == 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
+      - name: Zip Build
+        run: |
+          if ("${{ matrix.platform }}" -eq "Windows64") {
+            7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
+          } elseif ("${{ matrix.platform }}" -eq "Orbis") {
+            7z a -r "LCEOrbis.zip" "./ORBIS_${{ matrix.configuration }}/PS4_GAME/*"
+          } elseif ("${{ matrix.platform }}" -eq "PSVita") {
+            7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
+          } elseif ("${{ matrix.platform }}" -eq "PS3") {
+            7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*"
+          } elseif ("${{ matrix.platform }}" -eq "Xbox360") {
+            7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
+          } else {
+            7z a -r "LCE${{ matrix.platform }}.zip" "./${{ matrix.platform }}/${{ matrix.configuration }}/*" "-x!*.ipdb" "-x!*.iobj" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
+          }
 
       - name: Stage artifacts
         run: |
           New-Item -ItemType Directory -Force -Path staging
-          Copy-Item LCE${{ matrix.platform }}.zip staging/ 
+          Copy-Item "LCE${{ matrix.platform }}.zip" staging/
 
-      - name: Stage exe
-        if: matrix.platform == 'Windows64'
-        run: |
-          Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
+          if ("${{ matrix.platform }}" -eq "Windows64") {
+            Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
+          } elseif ("${{ matrix.platform }}" -eq "PSVita") {
+            Copy-Item "./PSVita_${{ matrix.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
+          } elseif ("${{ matrix.platform }}" -eq "Orbis") {
+            Copy-Item "./ORBIS_${{ matrix.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
+          }
 
       - name: Upload artifacts
         uses: https://github.com/actions/upload-artifact@v3
@@ -88,9 +105,14 @@ jobs:
             } catch {
               $body = $fallback
             }
+          } else {
+            $body = $fallback
           }
 
-          "description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
+          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
+          "description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          $body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          "$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
 
       - name: Publish Release
         uses: akkuman/gitea-release-action@v1

Minecraft.Client/Common/DLC/DLCPack.cpp

@@ -384,7 +384,10 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo
 
 bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
 {
-	if(type == DLCManager::e_DLCType_All)
+	// str1k3r - return every DLC as "purchased"
+	return true;
+
+	/*if(type == DLCManager::e_DLCType_All)
 	{
 		app.DebugPrintf("Unimplemented\n");
 #ifndef _CONTENT_PACKAGE
@@ -408,7 +411,7 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
 	{
 		//purchased
 		return true;
-	}
+	}*/
 }
 
 void  DLCPack::UpdateLanguage()

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

@@ -3,7 +3,7 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "Durango Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "Durango Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
 	"Durango\StoreImages",
@@ -16,7 +16,7 @@ $directories = @(
 	"Sound",
 	"Xbox",
 	"DLC",
-	"CU",
+	"CU"
 )
 
 foreach ($dir in $directories) {
@@ -31,7 +31,7 @@ $folderCopies = @(
 	@{ Source = "DurangoMedia\Tutorial"; Dest = "Tutorial" },
 	@{ Source = "music";      			 Dest = "music" },
 	@{ Source = "Durango\DLCImages";	 Dest = "DLCImages" },
-	@{ Source = "Durango\CU";	 Dest = "CU" },
+	@{ Source = "Durango\CU";	         Dest = "CU" }
 )
 
 foreach ($copy in $folderCopies) {

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

@@ -3,16 +3,18 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "Orbis Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "Orbis Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
     "PS4_GAME\music",
 	"PS4_GAME\Orbis",
 	"PS4_GAME\Common",
     "PS4_GAME\Common\Media",
-	"PS4_GAME\Common\Tutorial",
+	"PS4_GAME\Orbis\Tutorial",
     "PS4_GAME\Common\res",
-    "PS4_GAME\Orbis\Sound"
+    "PS4_GAME\Orbis\Sound",
+    "PS4_GAME\Orbis\DLCImages",
+    "PS4_GAME\Orbis\DLC"
 )
 
 foreach ($dir in $directories) {
@@ -23,8 +25,10 @@ $folderCopies = @(
     @{ Source = "music";		   Dest = "PS4_GAME\music" },
     @{ Source = "Common\Media";    Dest = "PS4_GAME\Common\Media" },
     @{ Source = "Common\res";      Dest = "PS4_GAME\Common\res" },
-    @{ Source = "PSVita\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" },
-	@{ Source = "Orbis\Sound";       Dest = "PS4_GAME\Orbis\Sound" },
+	@{ Source = "Orbis\Sound";     Dest = "PS4_GAME\Orbis\Sound" },
+    @{ Source = "OrbisMedia\DLC";  Dest = "PS4_GAME\Orbis\DLC" },
+    @{ Source = "Orbis\DLCImages"; Dest = "PS4_GAME\Orbis\DLCImages" },
+    @{ Source = "OrbisMedia\Tutorial";  Dest = "PS4_GAME\Orbis\Tutorial" },
     @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\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" }
@@ -100,4 +104,43 @@ foreach ($dir in $delDirs) {
                 Remove-Item -Force -ErrorAction SilentlyContinue
         }
     }
+}
+
+# Make Orbis PKG
+$tools = Join-Path $env:SCE_ROOT_DIR "\ORBIS\Tools\Publishing Tools\bin"
+$pkgSrc = Join-Path $OutDir "PS4_GAME"
+
+$genGp4 = Join-Path $tools "gengp4_app.exe"
+$pubCmd = Join-Path $tools "orbis-pub-cmd.exe"
+
+$pkgPath  = Join-Path $OutDir "Minecraft.Client.pkg"
+$gp4Name = $pkgSrc.TrimEnd('\','/')
+$gp4File = "$gp4Name.gp4"
+
+if (Test-Path $pkgPath) {
+    Remove-Item $pkgPath -Force
+}
+
+if (-not (Test-Path $genGp4)) {
+    Write-Host "Orbis Postbuild: gengp4_app.exe not found, skipping PKG creation."
+} elseif (-not (Test-Path $pkgSrc)) {
+    Write-Host "Orbis Postbuild: '$pkgSrc' not found, skipping PKG creation."
+} else {
+    Write-Host "Orbis Postbuild: Generating GP4..."
+    & $genGp4 $pkgSrc
+
+    if (-not (Test-Path $gp4File)) {
+        Write-Host "Orbis Postbuild ERROR: $gp4File was not created"
+        return
+    }
+
+    Write-Host "Orbis Postbuild: Patching GP4 default_id..."
+    (Get-Content $gp4File) -replace 'default_id="1"', 'default_id="0"' | Set-Content $gp4File
+
+    Write-Host "Orbis Postbuild: Building PKG..."
+    & $pubCmd img_create $gp4File $pkgPath
+
+    (Get-Content $gp4File) -replace 'default_id="1"', 'default_id="0"' | Set-Content $gp4File # str1k3r - ran again so we can open the GP4 file without it throwing a error.
+
+    Write-Host "Orbis Postbuild: PKG created at $pkgPath"
 }

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

@@ -3,7 +3,7 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "PS3 Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "PS3 Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
     "PS3_GAME\USRDIR\music",
@@ -24,7 +24,7 @@ $folderCopies = @(
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
 	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },
     @{ Source = "PS3\Sound";        Dest = "PS3_GAME\USRDIR\PS3\Sound" },
-	@{ Source = "PSVita\Tutorial";  Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }
+	#@{ Source = "PSVita\Tutorial";  Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR";  Dest = "PS3_GAME\LICDIR" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" }
 )
@@ -40,15 +40,15 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = "PS3\PS3ProductCodes.bin"; Dest = "PS3_GAME\USRDIR\PS3\PS3ProductCodes.bin" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_DISC.SFB"; Dest = "PS3_DISC.SFB" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\ICON0.PNG"; Dest = "PS3_GAME\ICON0.PNG" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PARAM.SFO"; Dest = "PS3_GAME\PARAM.SFO" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PIC1.PNG"; Dest = "PS3_GAME\PIC1.PNG" },
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_DISC.SFB";         Dest = "PS3_DISC.SFB" },
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\ICON0.PNG";   Dest = "PS3_GAME\ICON0.PNG" },
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PARAM.SFO";   Dest = "PS3_GAME\PARAM.SFO" },
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PIC1.PNG";    Dest = "PS3_GAME\PIC1.PNG" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.BG0"; Dest = "PS3_GAME\PS3GAME.BG0" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.BG1"; Dest = "PS3_GAME\PS3GAME.BG1" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.VR0"; Dest = "PS3_GAME\PS3GAME.VR0" },
 	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3LOGO.DAT"; Dest = "PS3_GAME\PS3GAME.DAT" },
-	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\SND0.AT3"; Dest = "PS3_GAME\SND0.AT3" }
+	@{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\SND0.AT3";    Dest = "PS3_GAME\SND0.AT3" }
 )
 
 foreach ($copy in $fileCopies) {

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

@@ -3,7 +3,7 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "PSVita Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "PSVita Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
     "PSVITA_GAME\music",
@@ -11,7 +11,8 @@ $directories = @(
 	"PSVITA_GAME\Common",
     "PSVITA_GAME\Common\Media",
     "PSVITA_GAME\Common\res",
-    "PSVITA_GAME\Sound"
+    "PSVITA_GAME\PSVita\Sound",
+    "PSVITA_GAME\PSVita\Tutorial"
 )
 
 foreach ($dir in $directories) {
@@ -24,7 +25,8 @@ $folderCopies = @(
     @{ Source = "Common\res";      Dest = "PSVITA_GAME\Common\res" },
 	@{ Source = "PSVita\Sound";    Dest = "PSVITA_GAME\PSVita\Sound" },
 	@{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" },
-	@{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module"; Dest = "PSVITA_GAME\sce_module" },
+    @{ Source = "PSVita\Tutorial"; Dest = "PSVITA_GAME\PSVita\Tutorial" },
+	@{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module";      Dest = "PSVITA_GAME\sce_module" },
     @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys";    Dest = "PSVITA_GAME\sce_sys" }
 )
 
@@ -101,9 +103,8 @@ foreach ($dir in $delDirs) {
     }
 }
 
-# ── VPK ────────────────────────────────────────────────────────────────────
-$repoRoot = Split-Path ($ProjectDir.TrimEnd('\', '/')) -Parent
-$vpkPath  = Join-Path $repoRoot "Minecraft.Client.vpk"
+# Make PSVita VPK
+$vpkPath  = Join-Path $OutDir "Minecraft.Client.vpk"
 $vpkSrc   = Join-Path $OutDir "PSVITA_GAME"
 $sevenZip = "C:\Program Files\7-Zip\7z.exe"
 
@@ -120,5 +121,4 @@ if (-not (Test-Path $sevenZip)) {
     & "$sevenZip" a -tzip -mx0 "$vpkPath" *
     Pop-Location
     Write-Host "PSVita Postbuild: VPK created at '$vpkPath'"
-    Start-Process explorer.exe "/select,`"$vpkPath`""
 }

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

@@ -3,7 +3,7 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "Windows64 Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "Windows64 Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
     "music",
@@ -19,13 +19,13 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
+    @{ Source = "music";                Dest = "music" },
     @{ Source = "Common\Media";    		Dest = "Common\Media" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
     @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
     @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
-	@{ Source = "PSVita\Tutorial"; 		Dest = "Windows64Media\Tutorial" },
-	@{ Source = "music"; Dest = "Windows64Media\music" },
-	@{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
+	#@{ Source = "PSVita\Tutorial"; 	 Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
+	@{ Source = "Windows64\Sound"; Dest = "Windows64Media\Sound" },
 	@{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" }
 )
 

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

@@ -3,7 +3,7 @@ param(
     [string]$ProjectDir
 )
 
-Write-Host "Xbox Postbuild script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+Write-Host "Xbox Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
     "res",
@@ -15,7 +15,7 @@ foreach ($dir in $directories) {
 }
 
 $copies = @(
-    @{ Source = "Common\res";      Dest = "res" }
+    @{ Source = "Common\res"; Dest = "res" }
 )
 
 foreach ($copy in $copies) {
@@ -38,9 +38,9 @@ $fileCopies = @(
 	@{ Source = "Xbox\kinect\speech\nuisp3081"; Dest = "nuisp3081" },
 	@{ Source = "Xbox\kinect\speech\nuisp3082"; Dest = "nuisp3082" },
 	@{ Source = "Xbox\kinect\speech\nuisp3084"; Dest = "nuisp3084" },
-	@{ Source = "XboxMedia\AvatarAwards"; Dest = "AvatarAwards" },
-	@{ Source = "XboxMedia\XZP\TMSFiles.xzp"; Dest = "TMSFiles.xzp" },
-	@{ Source = "Common\Tutorial\Tutorial"; Dest = "Tutorial\Tutorial" }
+	@{ Source = "XboxMedia\AvatarAwards";       Dest = "AvatarAwards" },
+	@{ Source = "XboxMedia\XZP\TMSFiles.xzp";   Dest = "TMSFiles.xzp" },
+	@{ Source = "Common\Tutorial\Tutorial";     Dest = "Tutorial\Tutorial" }
 )
 
 foreach ($copy in $fileCopies) {

Minecraft.Client/Minecraft.Client.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="ContentPackage_NO_TU|Durango">
@@ -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>