From 96e8ddf97e14e2e6019ac8b7225bb6ef76898672 Mon Sep 17 00:00:00 2001 From: Maschell Date: Mon, 17 Apr 2023 14:16:13 +0200 Subject: [PATCH] Fix compiling with latest wut --- Dockerfile | 10 +++++----- src/export.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90a84cd..6691981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM ghcr.io/wiiu-env/devkitppc:20221228 +FROM ghcr.io/wiiu-env/devkitppc:20230417 -COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230106 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230106 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libromfs_wiiu:20220904 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libcontentredirection:20221010 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230417 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230417 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libromfs_wiiu:20230417 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libcontentredirection:20230417 /artifacts $DEVKITPRO WORKDIR project diff --git a/src/export.cpp b/src/export.cpp index c95432f..5e60770 100644 --- a/src/export.cpp +++ b/src/export.cpp @@ -36,27 +36,27 @@ bool getAOCPath(std::string &outStr) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_Acquire failed"); return false; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_Initialize", reinterpret_cast(&AOC_Initialize)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_Initialize", reinterpret_cast(&AOC_Initialize)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_Finalize", reinterpret_cast(&AOC_Finalize)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_Finalize", reinterpret_cast(&AOC_Finalize)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_OpenTitle", reinterpret_cast(&AOC_OpenTitle)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_OpenTitle", reinterpret_cast(&AOC_OpenTitle)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_ListTitle", reinterpret_cast(&AOC_ListTitle)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_ListTitle", reinterpret_cast(&AOC_ListTitle)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_CalculateWorkBufferSize", reinterpret_cast(&AOC_CalculateWorkBufferSize)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_CalculateWorkBufferSize", reinterpret_cast(&AOC_CalculateWorkBufferSize)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; } - if (OSDynLoad_FindExport(aoc_handle, false, "AOC_CloseTitle", reinterpret_cast(&AOC_CloseTitle)) != OS_DYNLOAD_OK) { + if (OSDynLoad_FindExport(aoc_handle, OS_DYNLOAD_EXPORT_FUNC, "AOC_CloseTitle", reinterpret_cast(&AOC_CloseTitle)) != OS_DYNLOAD_OK) { DEBUG_FUNCTION_LINE_WARN("OSDynLoad_FindExport failed"); goto end; }