Fix compiling with latest wut

This commit is contained in:
Maschell 2023-03-26 19:44:55 +02:00
parent fc5d1a0aad
commit 1d29b1313b
3 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/wiiu-env/devkitppc:20221228 FROM ghcr.io/wiiu-env/devkitppc:20230326
WORKDIR tmp_build WORKDIR tmp_build
COPY . . COPY . .

View File

@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20221228 FROM ghcr.io/wiiu-env/devkitppc:20230326
WORKDIR project WORKDIR project

View File

@ -83,7 +83,7 @@ NotificationModuleStatus NotificationModule_InitLibrary() {
return NOTIFICATION_MODULE_RESULT_MODULE_NOT_FOUND; return NOTIFICATION_MODULE_RESULT_MODULE_NOT_FOUND;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMGetVersion", (void **) &sNMGetVersion) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMGetVersion", (void **) &sNMGetVersion) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMGetVersion failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMGetVersion failed.");
return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT; return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT;
} }
@ -94,35 +94,35 @@ NotificationModuleStatus NotificationModule_InitLibrary() {
return NOTIFICATION_MODULE_RESULT_UNSUPPORTED_VERSION; return NOTIFICATION_MODULE_RESULT_UNSUPPORTED_VERSION;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMIsOverlayReady", (void **) &sNMIsOverlayReady) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMIsOverlayReady", (void **) &sNMIsOverlayReady) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMIsOverlayReady failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMIsOverlayReady failed.");
sNMIsOverlayReady = nullptr; sNMIsOverlayReady = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMAddStaticNotification", (void **) &sNMAddStaticNotification) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMAddStaticNotification", (void **) &sNMAddStaticNotification) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMAddStaticNotification failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMAddStaticNotification failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMAddDynamicNotification", (void **) &sNMAddDynamicNotification) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMAddDynamicNotification", (void **) &sNMAddDynamicNotification) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMAddDynamicNotification failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMAddDynamicNotification failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMUpdateDynamicNotificationText", (void **) &sNMUpdateDynamicNotificationText) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationText", (void **) &sNMUpdateDynamicNotificationText) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationText failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationText failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMUpdateDynamicNotificationBackgroundColor", (void **) &sNMUpdateDynamicNotificationBackgroundColor) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationBackgroundColor", (void **) &sNMUpdateDynamicNotificationBackgroundColor) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationBackgroundColor failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationBackgroundColor failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMUpdateDynamicNotificationTextColor", (void **) &sNMUpdateDynamicNotificationTextColor) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMUpdateDynamicNotificationTextColor", (void **) &sNMUpdateDynamicNotificationTextColor) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationTextColor failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMUpdateDynamicNotificationTextColor failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMFinishDynamicNotification", (void **) &sNMFinishDynamicNotification) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMFinishDynamicNotification", (void **) &sNMFinishDynamicNotification) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_ERR("FindExport NMFinishDynamicNotification failed."); DEBUG_FUNCTION_LINE_ERR("FindExport NMFinishDynamicNotification failed.");
sNMAddStaticNotification = nullptr; sNMAddStaticNotification = nullptr;
} }
@ -156,7 +156,7 @@ NotificationModuleStatus NotificationModule_GetVersion(NotificationModuleAPIVers
return NOTIFICATION_MODULE_RESULT_MODULE_NOT_FOUND; return NOTIFICATION_MODULE_RESULT_MODULE_NOT_FOUND;
} }
if (OSDynLoad_FindExport(sModuleHandle, FALSE, "NMGetVersion", (void **) &sNMGetVersion) != OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "NMGetVersion", (void **) &sNMGetVersion) != OS_DYNLOAD_OK) {
DEBUG_FUNCTION_LINE_WARN("FindExport NMGetVersion failed."); DEBUG_FUNCTION_LINE_WARN("FindExport NMGetVersion failed.");
return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT; return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT;
} }