diff --git a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp index f1752311e6..bde07c79bb 100644 --- a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp @@ -2,16 +2,35 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" +namespace vm { using namespace ps3; } + logs::channel cellCrossController("cellCrossController"); -s32 cellCrossController_37E1F502() // LittleBigPlanet 2 and 3 +struct CellCrossControllerParam { - cellCrossController.todo("cellCrossController_37E1F502"); + vm::bcptr pPackageFileName; + vm::bcptr pSignatureFileName; + vm::bcptr pIconFileName; + vm::bptr option; +}; + +struct CellCrossControllerPackageInfo +{ + vm::bcptr pTitle; + vm::bcptr pTitleId; + vm::bcptr pAppVer; +}; + +using CellCrossControllerCallback = void(s32 status, s32 errorCode, vm::ptr option, vm::ptr userdata); + +s32 cellCrossControllerInitialize(vm::cptr pParam, vm::cptr pPkgInfo, vm::ptr cb, vm::ptr userdata) // LittleBigPlanet 2 and 3 +{ + cellCrossController.todo("cellCrossControllerInitialize(pParam=*0x%x, pPkgInfo=*0x%x, cb=*0x%x, userdata=*0x%x)", pParam, pPkgInfo, cb, userdata); return CELL_OK; } DECLARE(ppu_module_manager::cellCrossController)("cellCrossController", []() { - REG_FNID(cellCrossController, 0x37E1F502, cellCrossController_37E1F502); + REG_FUNC(cellCrossController, cellCrossControllerInitialize); }); diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp index 1454fb70e9..412cc50572 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp @@ -141,6 +141,12 @@ s32 cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr return CELL_OK; } +s32 cellOskDialogExtRegisterKeyboardEventHookCallbackEx(u16 hookEventMode, vm::ptr pCallback) +{ + cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallbackEx(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback); + return CELL_OK; +} + s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr filePath) { cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath); @@ -247,6 +253,7 @@ DECLARE(ppu_module_manager::cellOskDialog)("cellOskExtUtility", []() { REG_FUNC(cellOskExtUtility, cellOskDialogExtInputDeviceUnlock); REG_FUNC(cellOskExtUtility, cellOskDialogExtRegisterKeyboardEventHookCallback); + REG_FUNC(cellOskExtUtility, cellOskDialogExtRegisterKeyboardEventHookCallbackEx); REG_FUNC(cellOskExtUtility, cellOskDialogExtAddJapaneseOptionDictionary); REG_FUNC(cellOskExtUtility, cellOskDialogExtEnableClipboard); REG_FUNC(cellOskExtUtility, cellOskDialogExtSendFinishMessage); diff --git a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp index fb44bf0d52..dc4c5b267f 100644 --- a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp @@ -248,12 +248,126 @@ s32 cellSailRecorderCancel() return CELL_OK; } +s32 cellSailRecorderRegisterComposer() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailRecorderUnregisterComposer() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + s32 cellSailRecorderDumpImage() { UNIMPLEMENTED_FUNC(cellSailRec); return CELL_OK; } +s32 cellSailComposerInitialize() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerFinalize() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetStreamParameter() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsAudioParameter() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsUserParameter() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsVideoParameter() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsAudioAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsUserAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerGetEsVideoAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerTryGetEsAudioAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerTryGetEsUserAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerTryGetEsVideoAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerReleaseEsAudioAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerReleaseEsUserAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerReleaseEsVideoAu() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerNotifyCallCompleted() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + +s32 cellSailComposerNotifySessionError() +{ + UNIMPLEMENTED_FUNC(cellSailRec); + return CELL_OK; +} + DECLARE(ppu_module_manager::cellSailRec)("cellSailRec", []() { static ppu_static_module cellMp4("cellMp4"); @@ -301,6 +415,26 @@ DECLARE(ppu_module_manager::cellSailRec)("cellSailRec", []() REG_FUNC(cellSailRec, cellSailRecorderStart); REG_FUNC(cellSailRec, cellSailRecorderStop); REG_FUNC(cellSailRec, cellSailRecorderCancel); + REG_FUNC(cellSailRec, cellSailRecorderRegisterComposer); + REG_FUNC(cellSailRec, cellSailRecorderUnregisterComposer); REG_FUNC(cellSailRec, cellSailRecorderDumpImage); + + REG_FUNC(cellSailRec, cellSailComposerInitialize); + REG_FUNC(cellSailRec, cellSailComposerFinalize); + REG_FUNC(cellSailRec, cellSailComposerGetStreamParameter); + REG_FUNC(cellSailRec, cellSailComposerGetEsAudioParameter); + REG_FUNC(cellSailRec, cellSailComposerGetEsUserParameter); + REG_FUNC(cellSailRec, cellSailComposerGetEsVideoParameter); + REG_FUNC(cellSailRec, cellSailComposerGetEsAudioAu); + REG_FUNC(cellSailRec, cellSailComposerGetEsUserAu); + REG_FUNC(cellSailRec, cellSailComposerGetEsVideoAu); + REG_FUNC(cellSailRec, cellSailComposerTryGetEsAudioAu); + REG_FUNC(cellSailRec, cellSailComposerTryGetEsUserAu); + REG_FUNC(cellSailRec, cellSailComposerTryGetEsVideoAu); + REG_FUNC(cellSailRec, cellSailComposerReleaseEsAudioAu); + REG_FUNC(cellSailRec, cellSailComposerReleaseEsUserAu); + REG_FUNC(cellSailRec, cellSailComposerReleaseEsVideoAu); + REG_FUNC(cellSailRec, cellSailComposerNotifyCallCompleted); + REG_FUNC(cellSailRec, cellSailComposerNotifySessionError); }); diff --git a/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp similarity index 52% rename from rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp rename to rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp index 5caecf4716..cb1471d5e1 100644 --- a/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -#include "cellSubdisplay.h" +#include "cellSubDisplay.h" -logs::channel cellSubdisplay("cellSubdisplay"); +logs::channel cellSubDisplay("cellSubDisplay"); template<> void fmt_class_string::format(std::string& out, u64 arg) @@ -28,51 +28,51 @@ void fmt_class_string::format(std::string& out, u64 arg) error_code cellSubDisplayInit(vm::ptr pParam, vm::ptr func, vm::ptr userdata, u32 container) { - cellSubdisplay.todo("cellSubDisplayInit(pParam=*0x%x, func=*0x%x, userdata=*0x%x, container=0x%x)", pParam, func, userdata, container); + cellSubDisplay.todo("cellSubDisplayInit(pParam=*0x%x, func=*0x%x, userdata=*0x%x, container=0x%x)", pParam, func, userdata, container); return CELL_OK; } error_code cellSubDisplayEnd() { - cellSubdisplay.todo("cellSubDisplayEnd()"); + cellSubDisplay.todo("cellSubDisplayEnd()"); return CELL_OK; } error_code cellSubDisplayGetRequiredMemory(vm::ptr pParam) { - cellSubdisplay.warning("cellSubDisplayGetRequiredMemory(pParam=*0x%x)", pParam); + cellSubDisplay.warning("cellSubDisplayGetRequiredMemory(pParam=*0x%x)", pParam); - if (pParam->version == CELL_SUBDISPLAY_VERSION_0002) + switch (pParam->version) { - return not_an_error(CELL_SUBDISPLAY_0002_MEMORY_CONTAINER_SIZE); - } - else - { - return not_an_error(CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE); + case CELL_SUBDISPLAY_VERSION_0001: return not_an_error(CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE); + case CELL_SUBDISPLAY_VERSION_0002: return not_an_error(CELL_SUBDISPLAY_0002_MEMORY_CONTAINER_SIZE); + case CELL_SUBDISPLAY_VERSION_0003: return not_an_error(CELL_SUBDISPLAY_0003_MEMORY_CONTAINER_SIZE); } + + return CELL_SUBDISPLAY_ERROR_INVALID_VALUE; } error_code cellSubDisplayStart() { - cellSubdisplay.todo("cellSubDisplayStart()"); + cellSubDisplay.todo("cellSubDisplayStart()"); return CELL_OK; } error_code cellSubDisplayStop() { - cellSubdisplay.todo("cellSubDisplayStop()"); + cellSubDisplay.todo("cellSubDisplayStop()"); return CELL_OK; } error_code cellSubDisplayGetVideoBuffer(s32 groupId, vm::pptr ppVideoBuf, vm::ptr pSize) { - cellSubdisplay.todo("cellSubDisplayGetVideoBuffer(groupId=%d, ppVideoBuf=**0x%x, pSize=*0x%x)", groupId, ppVideoBuf, pSize); + cellSubDisplay.todo("cellSubDisplayGetVideoBuffer(groupId=%d, ppVideoBuf=**0x%x, pSize=*0x%x)", groupId, ppVideoBuf, pSize); return CELL_OK; } error_code cellSubDisplayAudioOutBlocking(s32 groupId, vm::ptr pvData, s32 samples) { - cellSubdisplay.todo("cellSubDisplayAudioOutBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples); + cellSubDisplay.todo("cellSubDisplayAudioOutBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples); if (samples % 1024) { @@ -84,7 +84,7 @@ error_code cellSubDisplayAudioOutBlocking(s32 groupId, vm::ptr pvData, s32 error_code cellSubDisplayAudioOutNonBlocking(s32 groupId, vm::ptr pvData, s32 samples) { - cellSubdisplay.todo("cellSubDisplayAudioOutNonBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples); + cellSubDisplay.todo("cellSubDisplayAudioOutNonBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples); if (samples % 1024) { @@ -96,34 +96,43 @@ error_code cellSubDisplayAudioOutNonBlocking(s32 groupId, vm::ptr pvData, error_code cellSubDisplayGetPeerNum(s32 groupId) { - cellSubdisplay.todo("cellSubDisplayGetPeerNum(groupId=%d)", groupId); + cellSubDisplay.todo("cellSubDisplayGetPeerNum(groupId=%d)", groupId); return CELL_OK; } error_code cellSubDisplayGetPeerList(s32 groupId, vm::ptr pInfo, vm::ptr pNum) { - cellSubdisplay.todo("cellSubDisplayGetPeerList(groupId=%d, pInfo=*0x%x, pNum=*0x%x)", groupId, pInfo, pNum); + cellSubDisplay.todo("cellSubDisplayGetPeerList(groupId=%d, pInfo=*0x%x, pNum=*0x%x)", groupId, pInfo, pNum); *pNum = 0; return CELL_OK; } -DECLARE(ppu_module_manager::cellSubdisplay)("cellSubdisplay", []() +error_code cellSubDisplayGetTouchInfo(s32 groupId, vm::ptr pTouchInfo, vm::ptr pNumTouchInfo) +{ + cellSubDisplay.todo("cellSubDisplayGetTouchInfo(groupId=%d, pTouchInfo=*0x%x, pNumTouchInfo=*0x%x)", groupId, pTouchInfo, pNumTouchInfo); + return CELL_OK; +} + +DECLARE(ppu_module_manager::cellSubDisplay)("cellSubDisplay", []() { // Initialization / Termination Functions - REG_FUNC(cellSubdisplay, cellSubDisplayInit); - REG_FUNC(cellSubdisplay, cellSubDisplayEnd); - REG_FUNC(cellSubdisplay, cellSubDisplayGetRequiredMemory); - REG_FUNC(cellSubdisplay, cellSubDisplayStart); - REG_FUNC(cellSubdisplay, cellSubDisplayStop); + REG_FUNC(cellSubDisplay, cellSubDisplayInit); + REG_FUNC(cellSubDisplay, cellSubDisplayEnd); + REG_FUNC(cellSubDisplay, cellSubDisplayGetRequiredMemory); + REG_FUNC(cellSubDisplay, cellSubDisplayStart); + REG_FUNC(cellSubDisplay, cellSubDisplayStop); // Data Setting Functions - REG_FUNC(cellSubdisplay, cellSubDisplayGetVideoBuffer); - REG_FUNC(cellSubdisplay, cellSubDisplayAudioOutBlocking); - REG_FUNC(cellSubdisplay, cellSubDisplayAudioOutNonBlocking); + REG_FUNC(cellSubDisplay, cellSubDisplayGetVideoBuffer); + REG_FUNC(cellSubDisplay, cellSubDisplayAudioOutBlocking); + REG_FUNC(cellSubDisplay, cellSubDisplayAudioOutNonBlocking); // Peer Status Acquisition Functions - REG_FUNC(cellSubdisplay, cellSubDisplayGetPeerNum); - REG_FUNC(cellSubdisplay, cellSubDisplayGetPeerList); + REG_FUNC(cellSubDisplay, cellSubDisplayGetPeerNum); + REG_FUNC(cellSubDisplay, cellSubDisplayGetPeerList); + + // + REG_FUNC(cellSubDisplay, cellSubDisplayGetTouchInfo); }); diff --git a/rpcs3/Emu/Cell/Modules/cellSubdisplay.h b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h similarity index 90% rename from rpcs3/Emu/Cell/Modules/cellSubdisplay.h rename to rpcs3/Emu/Cell/Modules/cellSubDisplay.h index d369fa8942..fd43e94814 100644 --- a/rpcs3/Emu/Cell/Modules/cellSubdisplay.h +++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h @@ -23,9 +23,11 @@ enum CELL_SUBDISPLAY_STATUS_FATALERROR = 3, CELL_SUBDISPLAY_VERSION_0001 = 1, CELL_SUBDISPLAY_VERSION_0002 = 2, + CELL_SUBDISPLAY_VERSION_0003 = 3, CELL_SUBDISPLAY_MODE_REMOTEPLAY = 1, CELL_SUBDISPLAY_VIDEO_FORMAT_A8R8G8B8 = 1, CELL_SUBDISPLAY_VIDEO_FORMAT_R8G8B8A8 = 2, + CELL_SUBDISPLAY_VIDEO_FORMAT_YUV420 = 3, CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_16_9 = 0, CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_4_3 = 1, CELL_SUBDISPLAY_VIDEO_MODE_SETDATA = 0, @@ -34,6 +36,7 @@ enum CELL_SUBDISPLAY_AUDIO_MODE_CAPTURE = 1, CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE = 8 * 1024 * 1024, CELL_SUBDISPLAY_0002_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024, + CELL_SUBDISPLAY_0003_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024, CELL_SUBDISPLAY_NICKNAME_LEN = 256, CELL_SUBDISPLAY_PSPID_LEN = 16, }; @@ -82,4 +85,12 @@ struct CellSubDisplayPeerInfo CellSubDisplayNickname pspNickname; }; +struct CellSubDisplayTouchInfo +{ + u8 status; + u8 force; + be_t x; + be_t y; +}; + using CellSubDisplayHandler = void(s32 cbMsg, u64 cbParam, vm::ptr userdata); diff --git a/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp b/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp index c9ce1773c0..0c3a9f8925 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp @@ -251,6 +251,7 @@ static const char* get_module_id(u16 id) case 0xf034: return "CELL_SYSMODULE_SAIL_REC"; case 0xf035: return "CELL_SYSMODULE_SYSUTIL_NP_TROPHY"; case 0xf044: return "CELL_SYSMODULE_SYSUTIL_NP_EULA"; + case 0xf053: return "CELL_SYSMODULE_ADEC_AT3MULTI"; case 0xf054: return "CELL_SYSMODULE_LIBATRAC3MULTI"; case 0xffff: return "CELL_SYSMODULE_INVALID"; } diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp index 7bea236807..ab061ce0ca 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp @@ -471,6 +471,12 @@ s32 _ZN4cxml8DocumentD1Ev() return CELL_OK; } +s32 _ZN4cxml8Document5ClearEv() +{ + UNIMPLEMENTED_FUNC(cellSysutil); + return CELL_OK; +} + s32 _ZN4cxml8Document13CreateElementEPKciPNS_7ElementE() { UNIMPLEMENTED_FUNC(cellSysutil); @@ -507,6 +513,12 @@ s32 _ZNK4cxml7Element12GetAttributeEPKcPNS_9AttributeE() return CELL_OK; } +s32 _ZNK4cxml7Element13GetFirstChildEv() +{ + UNIMPLEMENTED_FUNC(cellSysutil); + return CELL_OK; +} + s32 _ZNK4cxml7Element14GetNextSiblingEv() { UNIMPLEMENTED_FUNC(cellSysutil); @@ -537,6 +549,12 @@ s32 _ZN8cxmlutil6GetIntERKN4cxml7ElementEPKcPi() return CELL_OK; } +s32 _ZN8cxmlutil8GetFloatERKN4cxml7ElementEPKcPf() +{ + UNIMPLEMENTED_FUNC(cellSysutil); + return CELL_OK; +} + s32 _ZN8cxmlutil9GetStringERKN4cxml7ElementEPKcPS5_Pj() { UNIMPLEMENTED_FUNC(cellSysutil); @@ -636,6 +654,7 @@ DECLARE(ppu_module_manager::cellSysutil)("cellSysutil", []() REG_FUNC(cellSysutil, _ZN4cxml8DocumentC1Ev); REG_FUNC(cellSysutil, _ZN4cxml8DocumentD1Ev); + REG_FUNC(cellSysutil, _ZN4cxml8Document5ClearEv); REG_FUNC(cellSysutil, _ZN4cxml8Document13CreateElementEPKciPNS_7ElementE); REG_FUNC(cellSysutil, _ZN4cxml8Document14SetHeaderMagicEPKc); REG_FUNC(cellSysutil, _ZN4cxml8Document16CreateFromBufferEPKvjb); @@ -643,12 +662,14 @@ DECLARE(ppu_module_manager::cellSysutil)("cellSysutil", []() REG_FUNC(cellSysutil, _ZNK4cxml4File7GetAddrEv); REG_FUNC(cellSysutil, _ZNK4cxml7Element12GetAttributeEPKcPNS_9AttributeE); + REG_FUNC(cellSysutil, _ZNK4cxml7Element13GetFirstChildEv); REG_FUNC(cellSysutil, _ZNK4cxml7Element14GetNextSiblingEv); REG_FUNC(cellSysutil, _ZNK4cxml9Attribute6GetIntEPi); REG_FUNC(cellSysutil, _ZNK4cxml9Attribute7GetFileEPNS_4FileE); REG_FUNC(cellSysutil, _ZN8cxmlutil6SetIntERKN4cxml7ElementEPKci); REG_FUNC(cellSysutil, _ZN8cxmlutil6GetIntERKN4cxml7ElementEPKcPi); + REG_FUNC(cellSysutil, _ZN8cxmlutil8GetFloatERKN4cxml7ElementEPKcPf); REG_FUNC(cellSysutil, _ZN8cxmlutil9GetStringERKN4cxml7ElementEPKcPS5_Pj); REG_FUNC(cellSysutil, _ZN8cxmlutil9SetStringERKN4cxml7ElementEPKcS5_); REG_FUNC(cellSysutil, _ZN8cxmlutil16CheckElementNameERKN4cxml7ElementEPKc); diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index db273d68ea..de17964847 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -1507,6 +1507,18 @@ s32 sceNpScoreGetRankingByRangeAsync() return CELL_OK; } +s32 sceNpScoreGetFriendsRanking() +{ + UNIMPLEMENTED_FUNC(sceNp); + return CELL_OK; +} + +s32 sceNpScoreGetFriendsRankingAsync() +{ + UNIMPLEMENTED_FUNC(sceNp); + return CELL_OK; +} + s32 sceNpScoreCensorComment() { UNIMPLEMENTED_FUNC(sceNp); @@ -2009,6 +2021,8 @@ DECLARE(ppu_module_manager::sceNp)("sceNp", []() REG_FUNC(sceNp, sceNpScoreGetRankingByNpIdAsync); REG_FUNC(sceNp, sceNpScoreGetRankingByRange); REG_FUNC(sceNp, sceNpScoreGetRankingByRangeAsync); + REG_FUNC(sceNp, sceNpScoreGetFriendsRanking); + REG_FUNC(sceNp, sceNpScoreGetFriendsRankingAsync); REG_FUNC(sceNp, sceNpScoreCensorComment); REG_FUNC(sceNp, sceNpScoreCensorCommentAsync); REG_FUNC(sceNp, sceNpScoreSanitizeComment); diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index 5addc7e546..3e7b40608a 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -469,6 +469,42 @@ s32 sceNpMatching2SignalingGetPeerNetInfoResult() return CELL_OK; } +s32 sceNpAuthOAuthInit() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + +s32 sceNpAuthOAuthTerm() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + +s32 sceNpAuthCreateOAuthRequest() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + +s32 sceNpAuthDeleteOAuthRequest() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + +s32 sceNpAuthAbortOAuthRequest() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + +s32 sceNpAuthGetAuthorizationCode() +{ + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; +} + DECLARE(ppu_module_manager::sceNp2)("sceNp2", []() { REG_FUNC(sceNp2, sceNpMatching2DestroyContext); @@ -544,4 +580,11 @@ DECLARE(ppu_module_manager::sceNp2)("sceNp2", []() REG_FUNC(sceNp2, sceNpMatching2SignalingGetLocalNetInfo); REG_FUNC(sceNp2, sceNpMatching2SignalingGetPeerNetInfo); REG_FUNC(sceNp2, sceNpMatching2SignalingGetPeerNetInfoResult); + + REG_FUNC(sceNp2, sceNpAuthOAuthInit); + REG_FUNC(sceNp2, sceNpAuthOAuthTerm); + REG_FUNC(sceNp2, sceNpAuthCreateOAuthRequest); + REG_FUNC(sceNp2, sceNpAuthDeleteOAuthRequest); + REG_FUNC(sceNp2, sceNpAuthAbortOAuthRequest); + REG_FUNC(sceNp2, sceNpAuthGetAuthorizationCode); }); diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp index 828c59a7d4..bcbd9ede7a 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp @@ -155,6 +155,11 @@ s32 sceNpSnsFbLoadThrottle() fmt::throw_exception("Unimplemented" HERE); } +s32 sceNpSnsFbGetLongAccessToken() +{ + fmt::throw_exception("Unimplemented" HERE); +} + DECLARE(ppu_module_manager::sceNpSns)("sceNpSns", []() { @@ -164,7 +169,7 @@ DECLARE(ppu_module_manager::sceNpSns)("sceNpSns", []() REG_FUNC(sceNpSns, sceNpSnsFbDestroyHandle); REG_FUNC(sceNpSns, sceNpSnsFbAbortHandle); REG_FUNC(sceNpSns, sceNpSnsFbGetAccessToken); - + REG_FUNC(sceNpSns, sceNpSnsFbGetLongAccessToken); REG_FUNC(sceNpSns, sceNpSnsFbStreamPublish); REG_FUNC(sceNpSns, sceNpSnsFbCheckThrottle); REG_FUNC(sceNpSns, sceNpSnsFbCheckConfig); diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp index 9193b0d7a0..8b5600f5c0 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp @@ -140,6 +140,18 @@ s32 sceNpTusGetMultiUserVariableVUserAsync() return CELL_OK; } +s32 sceNpTusGetFriendsVariable() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + +s32 sceNpTusGetFriendsVariableAsync() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + s32 sceNpTusAddAndGetVariable() { UNIMPLEMENTED_FUNC(sceNpTus); @@ -308,6 +320,18 @@ s32 sceNpTusGetMultiUserDataStatusVUserAsync() return CELL_OK; } +s32 sceNpTusGetFriendsDataStatus() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + +s32 sceNpTusGetFriendsDataStatusAsync() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + s32 sceNpTusDeleteMultiSlotData() { UNIMPLEMENTED_FUNC(sceNpTus); @@ -332,6 +356,18 @@ s32 sceNpTusDeleteMultiSlotDataVUserAsync() return CELL_OK; } +s32 sceNpTssGetData() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + +s32 sceNpTssGetDataAsync() +{ + UNIMPLEMENTED_FUNC(sceNpTus); + return CELL_OK; +} + DECLARE(ppu_module_manager::sceNpTus)("sceNpTus", []() { REG_FUNC(sceNpTus, sceNpTusInit); @@ -356,6 +392,8 @@ DECLARE(ppu_module_manager::sceNpTus)("sceNpTus", []() REG_FUNC(sceNpTus, sceNpTusGetMultiUserVariableVUser); REG_FUNC(sceNpTus, sceNpTusGetMultiUserVariableAsync); REG_FUNC(sceNpTus, sceNpTusGetMultiUserVariableVUserAsync); + REG_FUNC(sceNpTus, sceNpTusGetFriendsVariable); + REG_FUNC(sceNpTus, sceNpTusGetFriendsVariableAsync); REG_FUNC(sceNpTus, sceNpTusAddAndGetVariable); REG_FUNC(sceNpTus, sceNpTusAddAndGetVariableVUser); REG_FUNC(sceNpTus, sceNpTusAddAndGetVariableAsync); @@ -384,8 +422,12 @@ DECLARE(ppu_module_manager::sceNpTus)("sceNpTus", []() REG_FUNC(sceNpTus, sceNpTusGetMultiUserDataStatusVUser); REG_FUNC(sceNpTus, sceNpTusGetMultiUserDataStatusAsync); REG_FUNC(sceNpTus, sceNpTusGetMultiUserDataStatusVUserAsync); + REG_FUNC(sceNpTus, sceNpTusGetFriendsDataStatus); + REG_FUNC(sceNpTus, sceNpTusGetFriendsDataStatusAsync); REG_FUNC(sceNpTus, sceNpTusDeleteMultiSlotData); REG_FUNC(sceNpTus, sceNpTusDeleteMultiSlotDataVUser); REG_FUNC(sceNpTus, sceNpTusDeleteMultiSlotDataAsync); REG_FUNC(sceNpTus, sceNpTusDeleteMultiSlotDataVUserAsync); + REG_FUNC(sceNpTus, sceNpTssGetData); + REG_FUNC(sceNpTus, sceNpTssGetDataAsync); }); diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index a5a09fad8f..8d9e2d8650 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -202,7 +202,7 @@ static void ppu_initialize_modules(const std::shared_ptr& link &ppu_module_manager::cellSpurs, &ppu_module_manager::cellSpursJq, &ppu_module_manager::cellSsl, - &ppu_module_manager::cellSubdisplay, + &ppu_module_manager::cellSubDisplay, &ppu_module_manager::cellSync, &ppu_module_manager::cellSync2, &ppu_module_manager::cellSysconf, diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/Emu/Cell/PPUModule.h index 8c88b839a9..dbaafeee09 100644 --- a/rpcs3/Emu/Cell/PPUModule.h +++ b/rpcs3/Emu/Cell/PPUModule.h @@ -189,7 +189,7 @@ public: static const ppu_static_module cellSpurs; static const ppu_static_module cellSpursJq; static const ppu_static_module cellSsl; - static const ppu_static_module cellSubdisplay; + static const ppu_static_module cellSubDisplay; static const ppu_static_module cellSync; static const ppu_static_module cellSync2; static const ppu_static_module cellSysconf; diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/Emu/Io/KeyboardHandler.h index 1ccc0e54b4..11e2a80c07 100644 --- a/rpcs3/Emu/Io/KeyboardHandler.h +++ b/rpcs3/Emu/Io/KeyboardHandler.h @@ -189,6 +189,7 @@ enum CellKbMappingType CELL_KB_MAPPING_BELGIAN_BELGIUM, CELL_KB_MAPPING_POLISH_POLAND, CELL_KB_MAPPING_PORTUGUESE_BRAZIL, + CELL_KB_MAPPING_TURKISH_TURKEY }; static const u32 KB_MAX_KEYBOARDS = 127; diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp index de78039b38..51f52f0d17 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp @@ -309,7 +309,7 @@ void VertexProgramDecompiler::AddCodeCond(const std::string& dst, const std::str swizzle = swizzle == "xyzw" ? "" : "." + swizzle; - std::string cond = compareFunction(cond_string_table[d0.cond], "cc" + std::to_string(d0.cond_reg_sel_1) + swizzle.c_str(), getFloatTypeName(4) + "(0., 0., 0., 0.)"); + std::string cond = compareFunction(cond_string_table[d0.cond], "cc" + std::to_string(d0.cond_reg_sel_1) + swizzle, getFloatTypeName(4) + "(0., 0., 0., 0.)"); ShaderVariable dst_var(dst); dst_var.symplify(); diff --git a/rpcs3/cmake_modules/cotire.cmake b/rpcs3/cmake_modules/cotire.cmake index 6cf0cb66a5..62cd23db98 100644 --- a/rpcs3/cmake_modules/cotire.cmake +++ b/rpcs3/cmake_modules/cotire.cmake @@ -3,7 +3,7 @@ # See the cotire manual for usage hints. # #============================================================================= -# Copyright 2012-2016 Sascha Kratky +# Copyright 2012-2017 Sascha Kratky # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -43,7 +43,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) endif() set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.7.9") +set (COTIRE_CMAKE_MODULE_VERSION "1.7.10") # activate select policies if (POLICY CMP0025) @@ -106,6 +106,11 @@ if (POLICY CMP0054) cmake_policy(SET CMP0054 NEW) endif() +if (POLICY CMP0055) + # strict checking for break() command + cmake_policy(SET CMP0055 NEW) +endif() + include(CMakeParseArguments) include(ProcessorCount) @@ -293,7 +298,7 @@ function (cotire_get_source_file_property_values _valuesVar _property) set (${_valuesVar} ${_values} PARENT_SCOPE) endfunction() -function (cotire_resolve_config_properites _configurations _propertiesVar) +function (cotire_resolve_config_properties _configurations _propertiesVar) set (_properties "") foreach (_property ${ARGN}) if ("${_property}" MATCHES "") @@ -309,8 +314,8 @@ function (cotire_resolve_config_properites _configurations _propertiesVar) set (${_propertiesVar} ${_properties} PARENT_SCOPE) endfunction() -function (cotire_copy_set_properites _configurations _type _source _target) - cotire_resolve_config_properites("${_configurations}" _properties ${ARGN}) +function (cotire_copy_set_properties _configurations _type _source _target) + cotire_resolve_config_properties("${_configurations}" _properties ${ARGN}) foreach (_property ${_properties}) get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET) if (_isSet) @@ -320,13 +325,18 @@ function (cotire_copy_set_properites _configurations _type _source _target) endforeach() endfunction() -function (cotire_get_target_usage_requirements _target _targetRequirementsVar) +function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar) set (_targetRequirements "") get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES) while (_librariesToProcess) # remove from head list (GET _librariesToProcess 0 _library) list (REMOVE_AT _librariesToProcess 0) + if (_library MATCHES "^\\$<\\$:([A-Za-z0-9_:-]+)>$") + set (_library "${CMAKE_MATCH_1}") + elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$:([A-Za-z0-9_:-]+)>$") + set (_library "${CMAKE_MATCH_1}") + endif() if (TARGET ${_library}) list (FIND _targetRequirements ${_library} _index) if (_index LESS 0) @@ -441,7 +451,7 @@ function (cotire_get_target_compile_flags _config _language _target _flagsVar) # interface compile options from linked library targets if (_target) set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} _linkedTargets) + cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) foreach (_linkedTarget ${_linkedTargets}) get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS) if (_targetOptions) @@ -573,7 +583,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu # interface include directories from linked library targets if (_target) set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} _linkedTargets) + cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) foreach (_linkedTarget ${_linkedTargets}) get_target_property(_linkedTargetType ${_linkedTarget} TYPE) if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND @@ -627,7 +637,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES) list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES}) endif() - if (WIN32) + if (WIN32 AND NOT MINGW) # convert Windows paths in include directories to CMake paths if (_includeDirs) set (_paths "") @@ -703,7 +713,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin endif() # interface compile definitions from linked library targets set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} _linkedTargets) + cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) foreach (_linkedTarget ${_linkedTargets}) get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS) if (_definitions) @@ -859,6 +869,9 @@ macro (cotire_set_cmd_to_prologue _cmdVar) list (APPEND ${_cmdVar} "--warn-uninitialized") endif() list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$") + if (XCODE) + list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE") + endif() if (COTIRE_VERBOSE) list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON") elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles") @@ -902,16 +915,16 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu foreach (_include ${_includeDirs}) if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") file (TO_NATIVE_PATH "${_include}" _include) - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}") + list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") else() set (_index -1) if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+") list (FIND ${_systemIncludesVar} "${_include}" _index) endif() if (_index GREATER -1) - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}") + list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") else() - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}") + list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") endif() endif() endforeach() @@ -1657,6 +1670,10 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio get_filename_component(_pchName "${_pchFile}" NAME) set (_xLanguage_C "c-header") set (_xLanguage_CXX "c++-header") + set (_pchSuppressMessages FALSE) + if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*") + set(_pchSuppressMessages TRUE) + endif() if (_flags) # append to list if ("${_language}" STREQUAL "CXX") @@ -1664,13 +1681,17 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio endif() list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}") if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - list (APPEND _flags "-Wpch-messages") + if (NOT _pchSuppressMessages) + list (APPEND _flags "-Wpch-messages") + endif() endif() else() # return as a flag string set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"") if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - set (_flags "${_flags} -Wpch-messages") + if (NOT _pchSuppressMessages) + set (_flags "${_flags} -Wpch-messages") + endif() endif() endif() endif() @@ -1781,17 +1802,25 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV if (_pchFile) get_filename_component(_pchDir "${_pchFile}" DIRECTORY) get_filename_component(_pchName "${_pchFile}" NAME) + set (_pchSuppressMessages FALSE) + if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*") + set(_pchSuppressMessages TRUE) + endif() if (_flags) # append to list list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}") if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - list (APPEND _flags "-Wpch-messages") + if (NOT _pchSuppressMessages) + list (APPEND _flags "-Wpch-messages") + endif() endif() else() # return as a flag string set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"") if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - set (_flags "${_flags} -Wpch-messages") + if (NOT _pchSuppressMessages) + set (_flags "${_flags} -Wpch-messages") + endif() endif() endif() else() @@ -1839,6 +1868,14 @@ function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile) if (_option_COMPILER_ID MATCHES "MSVC") # cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared unset (ENV{VS_UNICODE_OUTPUT}) + elseif (_option_COMPILER_ID MATCHES "GNU|Clang") + if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR + _option_COMPILER_EXECUTABLE MATCHES "ccache") + # Newer versions of Clang and GCC seem to embed a compilation timestamp into the precompiled header binary, + # which results in "file has been modified since the precompiled header was built" errors if ccache is used. + # We work around the problem by disabling ccache upon pre-compiling the prefix header. + set (ENV{CCACHE_DISABLE} "true") + endif() endif() execute_process( COMMAND ${_cmd} @@ -2191,7 +2228,7 @@ function (cotire_generate_target_script _language _configurations _target _targe XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1 - CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP + CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language} CMAKE_INCLUDE_SYSTEM_FLAG_${_language} CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG @@ -3036,8 +3073,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target) set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}") else() # append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties}) - cotire_resolve_config_properites("${_configurations}" _properties ${_outputDirProperties}) + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties}) + cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties}) foreach (_property ${_properties}) get_property(_outputDir TARGET ${_target} PROPERTY ${_property}) if (_outputDir) @@ -3057,11 +3094,11 @@ function (cotire_setup_unity_build_target _languages _configurations _target) RUNTIME_OUTPUT_DIRECTORY "${_outputDir}") endif() else() - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties}) endif() # copy output name - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_ LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_ OUTPUT_NAME OUTPUT_NAME_ @@ -3069,7 +3106,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) PREFIX _POSTFIX SUFFIX IMPORT_PREFIX IMPORT_SUFFIX) # copy compile stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} COMPILE_DEFINITIONS COMPILE_DEFINITIONS_ COMPILE_FLAGS COMPILE_OPTIONS Fortran_FORMAT Fortran_MODULE_DIRECTORY @@ -3081,12 +3118,12 @@ function (cotire_setup_unity_build_target _languages _configurations _target) C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN C_CLANG_TIDY CXX_CLANG_TIDY) # copy compile features - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED COMPILE_FEATURES) # copy interface stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS @@ -3094,7 +3131,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED) # copy link stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_FLAGS LINK_FLAGS_ @@ -3103,18 +3140,18 @@ function (cotire_setup_unity_build_target _languages _configurations _target) LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_ NO_SONAME SOVERSION VERSION - LINK_WHAT_YOU_USE) + LINK_WHAT_YOU_USE BUILD_RPATH) # copy cmake stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK) # copy Apple platform specific stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST - IOS_INSTALL_COMBINED) + IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE) # copy Windows platform specific stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} GNUtoMS COMPILE_PDB_NAME COMPILE_PDB_NAME_ COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_ @@ -3128,9 +3165,9 @@ function (cotire_setup_unity_build_target _languages _configurations _target) VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE - VS_SDK_REFERENCES) + VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY) # copy Android platform specific stuff - cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ANDROID_API ANDROID_API_MIN ANDROID_GUI ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 6f4ebf683b..3a4bec17f2 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -214,7 +214,7 @@ - + @@ -593,7 +593,7 @@ - + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 6afa94c69e..8663755a99 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -497,7 +497,7 @@ Emu\Cell\Modules - + Emu\Cell\Modules @@ -1363,7 +1363,7 @@ Emu\Cell\Modules - + Emu\Cell\Modules