The-Homebrew-Cloud/RPXLoadingModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/RPXLoadingModule.git synced 2024-11-25 11:26:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to use latest libraries

Browse Source
This commit is contained in:
Maschell 2022-09-04 14:43:42 +02:00
parent 905f712cd8
commit 8e3c2ae982
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,11 +1,11 @@
FROM wiiuenv/devkitppc:20220806 FROM wiiuenv/devkitppc:20220806
COPY --from=wiiuenv/librpxloader:20220825 /artifacts $DEVKITPRO COPY --from=wiiuenv/librpxloader:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libfunctionpatcher:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libfunctionpatcher:20220724 /artifacts $DEVKITPRO
COPY --from=wiiuenv/wiiumodulesystem:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/wiiumodulesystem:20220724 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libwuhbutils:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libwuhbutils:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libcontentredirection:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libcontentredirection:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libromfs_wiiu:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libromfs_wiiu:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libmocha:20220728 /artifacts $DEVKITPRO COPY --from=wiiuenv/libmocha:20220903 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

14
src/main.cpp
View File

@ -18,8 +18,8 @@
WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader"); WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader");
WUMS_USE_WUT_DEVOPTAB(); WUMS_USE_WUT_DEVOPTAB();
extern "C" bool CRGetVersion(); extern "C" ContentRedirectionApiErrorType CRGetVersion(ContentRedirectionVersion *);
extern "C" bool WUU_GetVersion(); extern "C" WUHBUtilsApiErrorType WUU_GetVersion(WUHBUtilsVersion *);
WUMS_INITIALIZE() { WUMS_INITIALIZE() {
initLogging(); initLogging();
@ -33,22 +33,22 @@ WUMS_INITIALIZE() {
gReplacementInfo = {}; gReplacementInfo = {};
// Call this function to make sure the Content Redirection will be loaded before this module is module. // Call this function to make sure the Content Redirection will be loaded before this module is module.
CRGetVersion(); CRGetVersion(nullptr);
// Call this function to make sure the WUHBUtils will be loaded before this module is module. // Call this function to make sure the WUHBUtils will be loaded before this module is module.
WUU_GetVersion(); WUU_GetVersion(nullptr);
// But then use libcontentredirection instead. // But then use libcontentredirection instead.
ContentRedirectionStatus error; ContentRedirectionStatus error;
if ((error = ContentRedirection_Init()) != CONTENT_REDIRECTION_RESULT_SUCCESS) { if ((error = ContentRedirection_InitLibrary()) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Failed to init ContentRedirection. Error %d", error); DEBUG_FUNCTION_LINE_ERR("Failed to init ContentRedirection. Error %d", error);
OSFatal("Failed to init ContentRedirection."); OSFatal("Failed to init ContentRedirection.");
} }
// But then use libwuhbutils instead. // But then use libwuhbutils instead.
WUHBUtilsStatus error2; WUHBUtilsStatus error2;
if ((error2 = WUHBUtils_Init()) != WUHB_UTILS_RESULT_SUCCESS) { if ((error2 = WUHBUtils_InitLibrary()) != WUHB_UTILS_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("RPXLoadingModule: Failed to init WUHBUtils. Error %d", error2); DEBUG_FUNCTION_LINE_ERR("Failed to init WUHBUtils. Error %d", error2);
OSFatal("Failed to init WUHBUtils."); OSFatal("Failed to init WUHBUtils.");
} }