From 68a5a4fc983d76a5e4b046fa4e46920e9754cca7 Mon Sep 17 00:00:00 2001 From: Maschell Date: Mon, 17 Apr 2023 14:11:08 +0200 Subject: [PATCH] Fix compiling with latest wut --- Dockerfile | 2 +- Dockerfile.buildlocal | 2 +- source/utils.cpp | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index c928143..35e7034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/wiiu-env/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20230417 WORKDIR tmp_build COPY . . diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal index bad125d..0a285f7 100644 --- a/Dockerfile.buildlocal +++ b/Dockerfile.buildlocal @@ -1,3 +1,3 @@ -FROM ghcr.io/wiiu-env/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20230417 WORKDIR project diff --git a/source/utils.cpp b/source/utils.cpp index e8be32c..74643b2 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -49,7 +49,7 @@ ContentRedirectionStatus ContentRedirection_InitLibrary() { return CONTENT_REDIRECTION_RESULT_MODULE_NOT_FOUND; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRGetVersion", (void **) &sCRGetVersion) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRGetVersion", (void **) &sCRGetVersion) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRGetVersion failed."); return CONTENT_REDIRECTION_RESULT_MODULE_MISSING_EXPORT; } @@ -58,27 +58,27 @@ ContentRedirectionStatus ContentRedirection_InitLibrary() { return CONTENT_REDIRECTION_RESULT_UNSUPPORTED_VERSION; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRAddFSLayer", (void **) &sCRAddFSLayer) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRAddFSLayer", (void **) &sCRAddFSLayer) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRAddFSLayer failed."); sCRAddFSLayer = nullptr; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRRemoveFSLayer", (void **) &sCRRemoveFSLayer) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRRemoveFSLayer", (void **) &sCRRemoveFSLayer) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRRemoveFSLayer failed."); sCRRemoveFSLayer = nullptr; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRSetActive", (void **) &sCRSetActive) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRSetActive", (void **) &sCRSetActive) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRSetActive failed."); sCRSetActive = nullptr; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRAddDevice", (void **) &sCRAddDevice) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRAddDevice", (void **) &sCRAddDevice) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRAddDevice failed."); sCRAddDevice = nullptr; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRRemoveDevice", (void **) &sCRRemoveDevice) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRRemoveDevice", (void **) &sCRRemoveDevice) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_ERR("FindExport CRRemoveDevice failed."); sCRRemoveDevice = nullptr; } @@ -98,7 +98,7 @@ ContentRedirectionStatus ContentRedirection_GetVersion(ContentRedirectionVersion return CONTENT_REDIRECTION_RESULT_MODULE_NOT_FOUND; } - if (OSDynLoad_FindExport(sModuleHandle, FALSE, "CRGetVersion", (void **) &sCRGetVersion) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "CRGetVersion", (void **) &sCRGetVersion) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("FindExport CRGetVersion failed."); return CONTENT_REDIRECTION_RESULT_MODULE_MISSING_EXPORT; }