From 1d29b1313b1f570f22d9635df668ff001fd9034b Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 26 Mar 2023 19:44:55 +0200 Subject: [PATCH] Fix compiling with latest wut --- Dockerfile | 2 +- Dockerfile.buildlocal | 2 +- source/utils.cpp | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ad2246..4dc803a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/wiiu-env/devkitppc:20221228 +FROM ghcr.io/wiiu-env/devkitppc:20230326 WORKDIR tmp_build COPY . . diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal index 33c5319..3373ac9 100644 --- a/Dockerfile.buildlocal +++ b/Dockerfile.buildlocal @@ -1,3 +1,3 @@ -FROM ghcr.io/wiiu-env/devkitppc:20221228 +FROM ghcr.io/wiiu-env/devkitppc:20230326 WORKDIR project \ No newline at end of file diff --git a/source/utils.cpp b/source/utils.cpp index e0618f0..a1051b2 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -83,7 +83,7 @@ NotificationModuleStatus NotificationModule_InitLibrary() { 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."); return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT; } @@ -94,35 +94,35 @@ NotificationModuleStatus NotificationModule_InitLibrary() { 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."); 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."); 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."); 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."); 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."); 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."); 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."); sNMAddStaticNotification = nullptr; } @@ -156,7 +156,7 @@ NotificationModuleStatus NotificationModule_GetVersion(NotificationModuleAPIVers 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."); return NOTIFICATION_MODULE_RESULT_MODULE_MISSING_EXPORT; }