From 6e13d5d4c07425e090baa3b17da6ba0cd46bccc9 Mon Sep 17 00:00:00 2001
From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com>
Date: Mon, 3 Aug 2026 14:27:03 -0400
Subject: [PATCH] fix: PS3 & Windows64 ContentPackage, Exclude PSVita libs &
OldSDK from other plats
---
.gitea/workflows/orbis.yaml | 8 +-
.gitea/workflows/ps3.yaml | 8 +-
.gitea/workflows/psvita.yaml | 8 +-
.gitea/workflows/release.yaml | 24 +-
.gitea/workflows/windows64.yaml | 6 +-
.gitea/workflows/xbox.yaml | 8 +-
.gitignore | 1 +
.../Leaderboards/LeaderboardManager.cpp | 2 +-
.../Common/Postbuilds/PS3-postbuild.ps1 | 10 +-
Minecraft.Client/Minecraft.Client.vcxproj | 338 ++++++++++++++++--
.../Minecraft.Client.vcxproj.filters | 5 +-
...ameRenderer_updateLightTexture.spu.vcxproj | 3 +-
.../PSVita/Network/SQRNetworkManager_Vita.h | 2 +-
.../PSVita/{ => PSVitaExtras}/OldSdk.cpp | 4 +-
.../PSVita/{ => PSVitaExtras}/OldSdk.h | 2 -
Minecraft.World/Minecraft.World.vcxproj | 3 +-
16 files changed, 374 insertions(+), 58 deletions(-)
rename Minecraft.Client/PSVita/{ => PSVitaExtras}/OldSdk.cpp (98%)
rename Minecraft.Client/PSVita/{ => PSVitaExtras}/OldSdk.h (98%)
diff --git a/.gitea/workflows/orbis.yaml b/.gitea/workflows/orbis.yaml
index bb338ea7..c4228cf4 100644
--- a/.gitea/workflows/orbis.yaml
+++ b/.gitea/workflows/orbis.yaml
@@ -16,7 +16,7 @@ on:
jobs:
build:
- runs-on: windows-2022
+ runs-on: sdk-orbis
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
+ clean: false
lfs: false
- name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
- path: staging/*
\ No newline at end of file
+ path: staging/*
+ compression-level: 0
\ No newline at end of file
diff --git a/.gitea/workflows/ps3.yaml b/.gitea/workflows/ps3.yaml
index d908f44c..de00a5ed 100644
--- a/.gitea/workflows/ps3.yaml
+++ b/.gitea/workflows/ps3.yaml
@@ -16,7 +16,7 @@ on:
jobs:
build:
- runs-on: windows-2022
+ runs-on: sdk-ps3
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
+ clean: false
lfs: false
- name: Build Cafeberry
@@ -45,7 +46,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
- path: staging/*
\ No newline at end of file
+ path: staging/*
+ compression-level: 0
\ No newline at end of file
diff --git a/.gitea/workflows/psvita.yaml b/.gitea/workflows/psvita.yaml
index dc2c1132..ee186b92 100644
--- a/.gitea/workflows/psvita.yaml
+++ b/.gitea/workflows/psvita.yaml
@@ -16,7 +16,7 @@ on:
jobs:
build:
- runs-on: windows-2022
+ runs-on: sdk-psvita
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
+ clean: false
lfs: false
- name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
- path: staging/*
\ No newline at end of file
+ path: staging/*
+ compression-level: 0
\ No newline at end of file
diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index fb5d6ab9..ffddd0e3 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -25,19 +25,30 @@ jobs:
build:
needs: validate
- runs-on: windows-2022
-
strategy:
matrix:
configuration: [Release]
- platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
+ include:
+ - platform: Windows64
+ sdk_label: windows-2022 # str1k3r - can run on any runner
+ - platform: Xbox360
+ sdk_label: sdk-xbox360
+ - platform: Orbis
+ sdk_label: sdk-orbis
+ - platform: PSVita
+ sdk_label: sdk-psvita
+ - platform: PS3
+ sdk_label: sdk-ps3
+
+ runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
- lfs: false
+ clean: false
+ lfs: false
- name: Build Cafeberry
run: |
@@ -78,17 +89,18 @@ jobs:
}
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
+ compression-level: 0
release:
needs: build
runs-on: windows-2022
steps:
- name: Download all build artifacts
- uses: https://github.com/actions/download-artifact@v3
+ uses: https://github.com/actions/download-artifact@v4
with:
path: downloaded
diff --git a/.gitea/workflows/windows64.yaml b/.gitea/workflows/windows64.yaml
index 54bdddbb..d1b8d870 100644
--- a/.gitea/workflows/windows64.yaml
+++ b/.gitea/workflows/windows64.yaml
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
+ clean: false
lfs: false
- name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
- path: staging/*
\ No newline at end of file
+ path: staging/*
+ compression-level: 0
\ No newline at end of file
diff --git a/.gitea/workflows/xbox.yaml b/.gitea/workflows/xbox.yaml
index 3afadd05..f7478608 100644
--- a/.gitea/workflows/xbox.yaml
+++ b/.gitea/workflows/xbox.yaml
@@ -16,7 +16,7 @@ on:
jobs:
build:
- runs-on: windows-2022
+ runs-on: sdk-xbox360
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
+ clean: false
lfs: false
- name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
- uses: https://github.com/actions/upload-artifact@v3
+ uses: https://github.com/actions/upload-artifact@v4
with:
name: build-${{ matrix.platform }}
- path: staging/*
\ No newline at end of file
+ path: staging/*
+ compression-level: 0
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 58aa2a68..0632105c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
# Misc
+*.ppu.o
*.pkg
/*.gp4p
/*.vpk
diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
index ec483669..c26c37e9 100644
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
@@ -9,7 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
L"Friends", L"MyScore", L"TopRank"
};
-#ifdef __PS3__ // str1k3r - only PS3 needs this, also this wasnt in the leak?
+#if defined(__PS3__) && !defined(_CONTENT_PACKAGE) // str1k3r - only PS3 needs this, also this wasnt in the leak?
LeaderboardManager *LeaderboardManager::m_instance = NULL;
#endif
diff --git a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1
index c6e83fec..65723d49 100644
--- a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1
+++ b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1
@@ -1,6 +1,7 @@
param(
[string]$OutDir,
- [string]$ProjectDir
+ [string]$ProjectDir,
+ [string]$Configuration
)
Write-Host "PS3 Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
@@ -59,7 +60,12 @@ foreach ($copy in $fileCopies) {
}
}
-$builtFile = Join-Path $OutDir "Minecraft.Client.self"
+if ($Configuration -match "ContentPackage") {
+ $builtFile = Join-Path $OutDir "Minecraft.Client.elf"
+} else {
+ $builtFile = Join-Path $OutDir "Minecraft.Client.self"
+}
+
$newName = "EBOOT.BIN"
$destDir = Join-Path $OutDir "PS3_GAME\USRDIR"
$destPath = Join-Path $destDir $newName
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 352bc05b..8fecaa87 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -806,11 +806,11 @@
- powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
- "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Debug /v:quiet
+ "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Debug /v:minimal
Build PS3 SPU Tasks
@@ -899,7 +899,7 @@
- powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
@@ -1027,7 +1027,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)$(ProjectName).pch
MultiThreaded
- _LARGE_WORLDS;_FINAL_BUILD;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)
+ _LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)
Disabled
Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)
true
@@ -1352,7 +1352,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)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
@@ -1449,7 +1449,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)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
@@ -1554,7 +1554,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)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
@@ -1636,6 +1636,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUDefault
1700;613;1011
-Xpch_override=1 %(AdditionalOptions)
+ PS3\Iggy\include;%(AdditionalIncludeDirectories)
true
@@ -1650,7 +1651,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)/"
+ powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"
Run PS3 postbuild script
@@ -1717,7 +1718,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)$(ProjectName).pch
MultiThreaded
- _FINAL_BUILD;NDEBUG;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ _LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
true
Disabled
@@ -1730,12 +1731,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse
$(OutDir)default.pdb
true
- d3d11.lib;..\Minecraft.World\x64_Release\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
+ d3d11.lib;..\Minecraft.World\x64_ContentPackage\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)
false
false
-
+ UseLinkTimeCodeGeneration
powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"
@@ -14148,8 +14149,46 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
-
-
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
@@ -14261,7 +14300,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
-
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
@@ -27700,7 +27764,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
-
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
@@ -33919,12 +34008,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU
true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
-
true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
-
true
true
@@ -33999,10 +34186,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
-
-
-
-
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
true
true
@@ -34012,7 +34299,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
true
- true
+ false
true
false
true
@@ -34065,6 +34352,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
+
true
true
@@ -34081,7 +34369,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
true
- true
+ false
true
false
true
@@ -34125,7 +34413,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
true
- false
+ true
false
true
false
@@ -34168,7 +34456,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue
true
true
- true
+ false
true
true
true
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters
index ad3f55ca..628815bf 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj.filters
+++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters
@@ -3772,7 +3772,7 @@
Common\Source Files\Leaderboards
-
+
PSVita
@@ -5916,7 +5916,7 @@
Common\Source Files\Leaderboards
-
+
PSVita
@@ -6176,6 +6176,7 @@
PSVita\4JLibs\libs
+
diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
index 0fdfb657..71e90736 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
+++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj
@@ -74,6 +74,7 @@
JobBin2
+ ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
@@ -99,7 +100,7 @@
JobBin2
- ..\$(TargetName).ppu$(ObjectExt)
+ ..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)
powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/"
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
index f1a85feb..23ca2365 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
@@ -10,7 +10,7 @@
#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
-#include "../OldSdk.h"
+#include "../PSVitaExtras/OldSdk.h"
class SQRNetworkPlayer;
class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PSVita/OldSdk.cpp b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp
similarity index 98%
rename from Minecraft.Client/PSVita/OldSdk.cpp
rename to Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp
index 3b2619ed..00d93077 100644
--- a/Minecraft.Client/PSVita/OldSdk.cpp
+++ b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp
@@ -1,6 +1,5 @@
#include "stdafx.h"
#include "OldSdk.h"
-#ifdef __PSVITA__
int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status) {
if (status) *status = SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN;
@@ -49,5 +48,4 @@ int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId
SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param) {
return -1;
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Minecraft.Client/PSVita/OldSdk.h b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h
similarity index 98%
rename from Minecraft.Client/PSVita/OldSdk.h
rename to Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h
index c77631ab..2739b5f6 100644
--- a/Minecraft.Client/PSVita/OldSdk.h
+++ b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h
@@ -1,5 +1,4 @@
#pragma once
-#ifdef __PSVITA__
#ifndef _OLD_SDK_H
#define _OLD_SDK_H 1
@@ -51,5 +50,4 @@ SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEvent
#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE (3)
-#endif
#endif
\ No newline at end of file
diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj
index c388f8d0..6d6c655f 100644
--- a/Minecraft.World/Minecraft.World.vcxproj
+++ b/Minecraft.World/Minecraft.World.vcxproj
@@ -1237,9 +1237,10 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- _FINAL_BUILD;NDEBUG;_WINDOWS64;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ _LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
Default
+ true
true