diff --git a/.gitmodules b/.gitmodules index 110001b2..63c3a174 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,4 @@ path = Minecraft.Client/Windows64/4JLibs url = https://gitea.str1k3r.xyz/str1k3r/4JLibs-VS2012 ignore = untracked + branch = main diff --git a/Minecraft.Client/Common/Buildsteps/4JLibs.ps1 b/Minecraft.Client/Common/Buildsteps/4JLibs.ps1 new file mode 100644 index 00000000..a9858ff2 --- /dev/null +++ b/Minecraft.Client/Common/Buildsteps/4JLibs.ps1 @@ -0,0 +1,69 @@ +param( + [string]$ProjectDir, + [string]$Platform, + [string]$Configuration +) + +switch ($Platform) { + "x64" { $LibsDir = Join-Path $ProjectDir "Windows64\4JLibs\"; $ExpectedCount = 4; $PlatformName = "Windows64" } + "Durango" { $LibsDir = Join-Path $ProjectDir "Durango\4JLibs\"; $ExpectedCount = 4; $PlatformName = "Durango" } + "Xbox 360" { $LibsDir = Join-Path $ProjectDir "Xbox\4JLibs\"; $ExpectedCount = 5; $PlatformName = "Xbox" } + "PS3" { $LibsDir = Join-Path $ProjectDir "PS3\4JLibs\"; $ExpectedCount = 4; $PlatformName = "PS3" } + "Orbis" { $LibsDir = Join-Path $ProjectDir "Orbis\4JLibs\"; $ExpectedCount = 4; $PlatformName = "Orbis" } + "PSVita" { $LibsDir = Join-Path $ProjectDir "PSVita\4JLibs\"; $ExpectedCount = 4; $PlatformName = "PSVita" } + default { Write-Host "4JLibs: Unknown platform: '$Platform'"; exit 1 } +} + +if ($Configuration -match "ContentPackage" -or $Configuration -match "Release") { + $BuildConfig = "Release" +} else { + Write-Host "4JLibs: Configuration did not match Release or ContentPackage, defaulting to Debug" + $BuildConfig = "Debug" +} + +if (-not (Test-Path $LibsDir)) { + Write-Host "4JLibs: $PlatformName 4JLibs directory not found" + exit 1 +} elseif (-not (Test-Path "$LibsDir\Headers\$PlatformName")) { + Write-Host "4JLibs: $PlatformName 4JLibs Headers directory not found" + exit 1 +} elseif (-not (Test-Path "$LibsDir\Headers")) { + Write-Host "4JLibs: Headers directory not found" + exit 1 +} + +$incPath = Join-Path $LibsDir "inc" +$libsPath = Join-Path $LibsDir "libs" + +$incCount = (Get-ChildItem -Path $incPath -Filter "*.h" -ErrorAction SilentlyContinue).Count + +if ($BuildConfig -eq "Release") { + $libCount = (Get-ChildItem -Path $libsPath -Filter "*_r.lib" -ErrorAction SilentlyContinue).Count +} else { + $libCount = (Get-ChildItem -Path $libsPath -Filter "*_d.lib" -ErrorAction SilentlyContinue).Count +} + +if ($incCount -lt $ExpectedCount) { + Write-Host "4JLibs: Copying header files for $PlatformName" + xcopy "$LibsDir\Headers\$PlatformName\*" "$incPath" /E /I /Y +} else { + Write-Host "4JLibs: inc files already present, skipping copy." +} + +if ($libCount -lt $ExpectedCount) { + Write-Host "4JLibs: Building 4JLibs for $PlatformName in $BuildConfig" + + & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ` + (Join-Path $LibsDir "4JLibs.sln") ` + /p:Configuration=$BuildConfig ` + /p:Platform=$PlatformName ` + /v:minimal ` + /m + + if ($LASTEXITCODE -ne 0) { + Write-Host "4JLibs: Build failed with exit code: $LASTEXITCODE" + exit $LASTEXITCODE + } +} else { + Write-Host "4JLibs: libs already present, skipping build." +} \ No newline at end of file diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/icon0.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/icon0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/icon0.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/icon0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/00/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/00/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/00/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/00/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/01/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/01/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/01/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/01/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/02/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/02/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/02/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/02/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/03/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/03/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/03/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/03/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/04/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/04/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/04/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/04/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/05/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/05/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/05/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/05/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/06/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/06/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/06/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/06/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/07/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/07/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/07/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/07/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/08/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/08/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/08/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/08/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/09/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/09/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/09/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/09/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/10/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/10/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/10/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/10/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/11/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/11/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/11/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/11/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/12/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/12/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/12/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/12/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/13/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/13/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/13/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/13/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/14/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/14/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/14/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/14/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/15/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/15/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/15/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/15/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/16/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/16/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/16/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/16/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/17/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/17/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/17/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/17/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/18/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/18/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/18/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/18/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/19/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/19/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/19/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/19/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/20/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/20/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/20/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/20/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keystone b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keystone similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keystone rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keystone diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/nptitle.dat b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/nptitle.dat similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/nptitle.dat rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/nptitle.dat diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/param.sfo similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/param.sfo diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic0.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic0.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic1.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic1.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic1.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic1.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.sig b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.sig similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.sig rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.sig diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.xml b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.xml similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.xml rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.xml diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/snd0.at9 b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/snd0.at9 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/snd0.at9 rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/snd0.at9 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/Trophy00.trp b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/trophy/Trophy00.trp similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/Trophy00.trp rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/trophy/Trophy00.trp diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_DISC.SFB b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_DISC.SFB similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_DISC.SFB rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_DISC.SFB diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/ICON0.PNG b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/ICON0.PNG similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/ICON0.PNG rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/ICON0.PNG diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PARAM.SFO b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PARAM.SFO similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PARAM.SFO rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PARAM.SFO diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PIC1.PNG b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PIC1.PNG similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PIC1.PNG rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PIC1.PNG diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG0 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG0 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG0 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG0 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG1 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG1 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG1 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG1 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.VR0 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.VR0 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.VR0 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.VR0 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3LOGO.DAT b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3LOGO.DAT similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3LOGO.DAT rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3LOGO.DAT diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/SND0.AT3 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/SND0.AT3 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/SND0.AT3 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/SND0.AT3 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/icon.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/icon.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/icon.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/icon.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/icon0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/icon0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/icon0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/icon0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/bg0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/bg0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/bg0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/bg0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_1.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_1.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_1.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_1.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_2.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_2.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_2.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_2.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/startup.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/startup.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/startup.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/startup.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/template.xml b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/template.xml similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/template.xml rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/template.xml diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/param.sfo b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/param.sfo similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/param.sfo rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/param.sfo diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/pic0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/pic0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/pic0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/pic0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/Effects.msscmp b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/Effects.msscmp similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/Effects.msscmp rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/Effects.msscmp diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/iggy_w64.dll b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/iggy_w64.dll rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/mss64.dll b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/mss64.dll similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/mss64.dll rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/mss64.dll diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/binkawin64.asi b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/binkawin64.asi rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dolby.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dolby.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64ds3d.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64ds3d.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dsp.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dsp.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64eax.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64eax.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64srs.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64srs.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt diff --git a/Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 similarity index 97% rename from Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 index fd3aba56..001cfb11 100644 --- a/Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 @@ -86,7 +86,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 similarity index 98% rename from Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 index 434b8359..cc908b50 100644 --- a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 @@ -100,7 +100,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 similarity index 98% rename from Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 index 65723d49..622d9702 100644 --- a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 @@ -105,7 +105,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 diff --git a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 similarity index 97% rename from Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 index f2a2f647..69eb9ff0 100644 --- a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 @@ -82,7 +82,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index e4bf45f6..b02657a8 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -708,7 +708,7 @@ xavatar2d.lib;xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirund.lib;xuirenderd.lib;xuihtmld.lib;xonline.lib;xhvd2.lib;qnetxaudio2d.lib;xpartyd.lib;..\Minecraft.World\Debug\Minecraft.World.lib;xbox\4JLibs\libs\4J_Input_d.lib;xbox\4JLibs\libs\4J_Storage_d.lib;xbox\4JLibs\libs\4J_Profile_d.lib;xbox\4JLibs\libs\4J_Render_d.lib;xsocialpostd.lib;xrnmd.lib;xbox\Sentient\libs\SenCoreD.lib;xbox\Sentient\libs\SenNewsD.lib;xbox\Sentient\libs\SenUGCD.lib;xbox\Sentient\libs\SenBoxArtD.lib;nuiapid.lib;STd.lib;NuiFitnessApid.lib;NuiHandlesd.lib;NuiSpeechd.lib;xhttpd.lib;xauthd.lib;xgetserviceendpointd.lib;xavd.lib;xjsond.lib;xbox\4JLibs\libs\4J_XTMS_d.lib;%(AdditionalDependencies) - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -767,7 +767,7 @@ Run Xbox postbuild script - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" @@ -806,7 +806,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -854,7 +854,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -899,7 +899,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -937,23 +937,15 @@ false - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - for %%C in (Debug Release) do ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=%%C /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed for %%C - exit /b 1 - ) - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -1057,21 +1049,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=$(Configuration) /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed! - exit /b 1 - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -1182,7 +1168,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1230,7 +1216,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1278,7 +1264,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1327,7 +1313,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1376,7 +1362,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1426,7 +1412,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUNone - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1473,7 +1459,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1529,7 +1515,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1578,7 +1564,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1634,7 +1620,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripSymsAndDebug - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1675,7 +1661,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1723,7 +1709,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU--strip-duplicates - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1763,21 +1749,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUUseLinkTimeCodeGeneration - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=$(Configuration) /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed! - exit /b 1 - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -1811,21 +1791,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=$(Configuration) /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed! - exit /b 1 - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -1855,21 +1829,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=$(Configuration) /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed! - exit /b 1 - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -1903,21 +1871,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script - if not exist "$(ProjectDir)Windows64\4JLibs\libs" ( - "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)Windows64\4JLibs\4JLibs.sln" /p:Platform=Windows64 /p:Configuration=$(Configuration) /v:minimal - if errorlevel 1 ( - echo 4JLibs build failed! - exit /b 1 - ) - xcopy "$(ProjectDir)Windows64\4JLibs\Headers\$(Platform)" "$(ProjectDir)Windows64\4JLibs\inc" /E /I /Y -) - Build 4JLibs + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + @@ -2170,7 +2132,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2202,7 +2164,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2229,7 +2191,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2256,7 +2218,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU..\Minecraft.World\ORBIS_ReleaseForArt\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_rtti;-lSceNpToolkitUtils_rtti;-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 - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2272,7 +2234,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2297,7 +2259,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2341,7 +2303,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUNone - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -2353,12 +2315,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUXML Designer - - - - - - + + + + + + + true true diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index 13238d03..4e72f61f 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -884,12 +884,13 @@ PSVita\Iggy\gdraw - - - - - - + + + + + + + diff --git a/Minecraft.Client/Windows64/4JLibs b/Minecraft.Client/Windows64/4JLibs index 16af7791..d086428e 160000 --- a/Minecraft.Client/Windows64/4JLibs +++ b/Minecraft.Client/Windows64/4JLibs @@ -1 +1 @@ -Subproject commit 16af7791cea4ca819fb16d4b8a4581aeba8541a8 +Subproject commit d086428ecaf6225a89a85d4a184b7e24fcc7f135