From 9f181ba8c18e1d110323b105bbccb03b4bb2da54 Mon Sep 17 00:00:00 2001 From: 552eden <552eden@gmail.com> Date: Sat, 18 Jul 2026 09:45:14 +0300 Subject: [PATCH] make vita content package target build --- .gitignore | 3 +++ Minecraft.Client/ClientConnection.cpp | 3 ++- .../Common/Leaderboards/SonyLeaderboardManager.cpp | 5 ++--- Minecraft.Client/Minecraft.Client.vcxproj | 5 ++--- .../PSVita/Leaderboards/PSVitaLeaderboardManager.cpp | 5 ++++- MinecraftConsoles.sln | 6 ++++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 865e11d5..537227e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /PS3_Release /PSVita_Debug /PSVita_Release +/PSVita_ContentPackage /X360_Debug /X360_Release /Release @@ -18,6 +19,7 @@ /Minecraft.Client/PS3_Release /Minecraft.Client/PSVita_Debug /Minecraft.Client/PSVita_Release +/Minecraft.Client/PSVita_ContentPackage /Minecraft.Client/X360_Debug /Minecraft.Client/X360_Release /Minecraft.Client/Debug @@ -31,6 +33,7 @@ /Minecraft.World/PS3_Release /Minecraft.World/PSVita_Debug /Minecraft.World/PSVita_Release +/Minecraft.World/PSVita_ContentPackage /Minecraft.World/X360_Debug /Minecraft.World/X360_Release /Minecraft.World/Debug diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index 9c448422..ade57d55 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -1964,6 +1964,7 @@ void ClientConnection::handlePreLogin(shared_ptr packet) #elif defined __PSVITA__ sce::Toolkit::NP::Utilities::Future friendList; int ret = -1; + /* if(!CGameNetworkManager::usingAdhocMode()) // we don't need to be friends in PSN for adhoc mode { int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, false); @@ -1974,7 +1975,7 @@ void ClientConnection::handlePreLogin(shared_ptr packet) friendCount = friendList.get()->size(); } } - } + }*/ #else // __ORBIS__ /* //sce::Toolkit::NP::Utilities::Future friendList; diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp index 6f28cb9e..d191110d 100644 --- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -206,9 +206,8 @@ HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId &myNpId, SceNpId* & // 4J-JEV: Implementation for Orbis & Vita as they a very similar. #if (defined __PSVITA__) - std::vector s_friendList; - //ret = getFriendsList(s_friendList); - ret = 42069; + sce::Toolkit::NP::Utilities::Future s_friendList; + ret = getFriendsList(s_friendList); if(ret != SCE_TOOLKIT_NP_SUCCESS) { // Error handling diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index bda9453c..409773fd 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -1398,7 +1398,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata" true $(OutDir)$(ProjectName).pdb - -lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceHttp_stub.a;libSceNet_stub.a;libSceSsl_stub.a;libSceNetCtl_stub.a;libSceNpManager_stub.a;libSceNpBasic_stub.a;libSceNpCommon_stub.a;libSceNpUtility_stub.a;libSceNpMatching2_stub.a;libSceNpScore_stub.a;libSceNpToolkit.a;libSceNpToolkitUtils.a;libSceNpTrophy_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;libSceAppMgr_stub.a;libSceSysmodule_stub.a;libSceCommonDialog_stub.a;libSceCtrl_stub.a;libSceGxm_stub.a;libSceDisplay_stub.a;libSceSystemGesture_stub.a;libSceTouch_stub.a;libSceFios2_stub.a;libSceAppUtil_stub.a;libSceNearUtil_stub.a;libScePower_stub.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Input.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Profile.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Render.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Storage.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a + -lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceHttp_stub.a;libSceNet_stub.a;libSceSsl_stub.a;libSceNetCtl_stub.a;libSceNpManager_stub.a;libSceNpBasic_stub.a;libSceNpCommon_stub.a;libSceNpUtility_stub.a;libSceNpMatching2_stub.a;libSceNpScore_stub.a;libSceNpToolkit.a;libSceNpToolkitUtils.a;libSceNpTrophy_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;libSceAppMgr_stub.a;libSceSysmodule_stub.a;libSceCommonDialog_stub.a;libSceCtrl_stub.a;libSceGxm_stub.a;libSceDisplay_stub.a;libSceSystemGesture_stub.a;libSceTouch_stub.a;libSceFios2_stub.a;libSceAppUtil_stub.a;libScePower_stub.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Input.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Profile.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Render.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Storage.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a StripFuncsAndData --strip-duplicates None @@ -2137,7 +2137,7 @@ copy /B /Y $(ProjectDir)Durango\DurangoExtras\xcompress.dll $(LayoutDir)Image\Lo true $(OutDir)$(ProjectName).pdb - -lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceHttp_stub.a;libSceNet_stub.a;libSceSsl_stub.a;libSceNetCtl_stub.a;libSceNpManager_stub.a;libSceNpBasic_stub.a;libSceNpCommon_stub.a;libSceNpUtility_stub.a;libSceNpMatching2_stub.a;libSceNpScore_stub.a;libSceNpToolkit.a;libSceNpToolkitUtils.a;libSceNpTrophy_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;libSceAppMgr_stub.a;libSceSysmodule_stub.a;libSceCommonDialog_stub.a;libSceCtrl_stub.a;libSceGxm_stub.a;libSceDisplay_stub.a;libSceSystemGesture_stub.a;libSceTouch_stub.a;libSceFios2_stub.a;libSceAppUtil_stub.a;libSceNearUtil_stub.a;libScePower_stub.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Input.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Profile.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Render.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Storage.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a + -lSceGxm_stub;-lSceAppUtil_stub;-lSceCommonDialog_stub;-lSceDisplay_stub;-lSceTouch_stub;-lSceCtrl_stub;-lSceAudio_stub;-lSceSysmodule_stub;-lSceDeflt;-lScePng;$(OutDir)Minecraft.World.a;libSceRtc_stub.a;libSceFios2_stub_weak.a;libSceCes.a;libScePerf_stub.a;libScePerf_stub_weak.a;libSceUlt_stub.a;libSceUlt_stub_weak.a;libSceHttp_stub.a;libSceNet_stub.a;libSceSsl_stub.a;libSceNetCtl_stub.a;libSceNpManager_stub.a;libSceNpBasic_stub.a;libSceNpCommon_stub.a;libSceNpUtility_stub.a;libSceNpMatching2_stub.a;libSceNpScore_stub.a;libSceNpToolkit.a;libSceNpToolkitUtils.a;libSceNpTrophy_stub.a;libSceRudp_stub_weak.a;libSceVoice_stub.a;libSceNetAdhocMatching_stub.a;libScePspnetAdhoc_stub.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2.a;..\Minecraft.Client\PSVita\Miles\lib\binkapsp2.a;..\Minecraft.Client\PSVita\Miles\lib\msspsp2midi.a;..\Minecraft.Client\PSVita\Miles\lib\fltpsp2.a;libSceAppMgr_stub.a;libSceSysmodule_stub.a;libSceCommonDialog_stub.a;libSceCtrl_stub.a;libSceGxm_stub.a;libSceDisplay_stub.a;libSceSystemGesture_stub.a;libSceTouch_stub.a;libSceFios2_stub.a;libSceAppUtil_stub.a;libScePower_stub.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Input.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Profile.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Render.a;..\Minecraft.Client\PSVita\4JLibs\libs\4J_Storage.a;..\Minecraft.Client\Common\Network\Sony\sceRemoteStorage\psvita\lib\sceRemoteStorage.a StripFuncsAndData --strip-duplicates None @@ -32779,7 +32779,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true - true true diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp index 9b584916..d079d8c2 100644 --- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp +++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp @@ -55,7 +55,10 @@ HRESULT PSVitaLeaderboardManager::destroyTransactionContext(int transactionConte HRESULT PSVitaLeaderboardManager::getFriendsList(sce::Toolkit::NP::Utilities::Future &friendsList) { - return sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendsList, false); + // Stubbed: the vendored libSceNpToolkit_rtti.a only exports getFriendslist() for + // Future>, but this SDK's headers declare FriendsList as vector, + // so the real call is an undefined symbol at link time. Fail gracefully until the lib is updated. + return -1; } char *PSVitaLeaderboardManager::getComment(SceNpScoreComment *comment) diff --git a/MinecraftConsoles.sln b/MinecraftConsoles.sln index f8c91f8a..432dd9cb 100644 --- a/MinecraftConsoles.sln +++ b/MinecraftConsoles.sln @@ -63,7 +63,8 @@ Global {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Durango.ActiveCfg = ContentPackage|Win32 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|ORBIS.ActiveCfg = ContentPackage|Win32 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PS3.ActiveCfg = ContentPackage|Win32 - {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PSVita.ActiveCfg = ContentPackage|Win32 + {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PSVita.ActiveCfg = ContentPackage|PSVita + {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PSVita.Build.0 = ContentPackage|PSVita {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Windows64.ActiveCfg = ContentPackage|x64 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Windows64.Build.0 = ContentPackage|x64 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Win32 @@ -106,7 +107,8 @@ Global {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Durango.ActiveCfg = ContentPackage|Win32 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|ORBIS.ActiveCfg = ContentPackage|Win32 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PS3.ActiveCfg = ContentPackage|Win32 - {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PSVita.ActiveCfg = ContentPackage|Win32 + {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PSVita.ActiveCfg = ContentPackage|PSVita + {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PSVita.Build.0 = ContentPackage|PSVita {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Windows64.ActiveCfg = ContentPackage|Win32 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Win32 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Durango.ActiveCfg = Debug|Win32