diff --git a/Dockerfile b/Dockerfile index ec3c11e..43bdb96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/wiiu-env/devkitppc:20240704 +FROM ghcr.io/wiiu-env/devkitppc:20260225 -COPY --from=ghcr.io/wiiu-env/libmocha:20230621 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/librpxloader:20240425 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libmocha:20260126 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/librpxloader:20260207 /artifacts $DEVKITPRO WORKDIR project diff --git a/Makefile b/Makefile index 01f8b5f..330a3b6 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ INCLUDES := source include #------------------------------------------------------------------------------- # options for code generation #------------------------------------------------------------------------------- -CFLAGS := -g -Wall -O2 -ffunction-sections -fno-exceptions \ +CFLAGS := -g -Wall -Werror -O2 -ffunction-sections -fno-exceptions \ $(MACHDEP) CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__ diff --git a/source/BootUtils.cpp b/source/BootUtils.cpp index bf8ad4b..635800f 100644 --- a/source/BootUtils.cpp +++ b/source/BootUtils.cpp @@ -4,6 +4,7 @@ #include "logger.h" #include #include +#include #include #include #include @@ -54,9 +55,7 @@ void handleAccountSelection() { accountInfo->slot = i; auto result = nn::act::GetMiiNameEx(reinterpret_cast(nameOut), i); if (result.IsSuccess()) { - std::u16string source; - std::wstring_convert, char16_t> convert; - accountInfo->name = convert.to_bytes((char16_t *) nameOut); + accountInfo->name = std::filesystem::path(nameOut).string(); } else { accountInfo->name = "[UNKNOWN]"; } diff --git a/source/crt.c b/source/crt.c index 25bf56f..fb47ab2 100644 --- a/source/crt.c +++ b/source/crt.c @@ -2,7 +2,7 @@ void __init_wut_malloc(); void __init_wut_newlib(); -void __init_wut_stdcpp(); +void __init_wut_thread(); void __init_wut_devoptab(); @@ -12,8 +12,6 @@ void __fini_wut_malloc(); void __fini_wut_newlib(); -void __fini_wut_stdcpp(); - void __fini_wut_devoptab(); void __fini(); @@ -22,9 +20,9 @@ void __attribute__((weak)) __fini_wut_socket(); void __attribute__((weak)) __init_wut_() { + __init_wut_thread(); __init_wut_malloc(); __init_wut_newlib(); - __init_wut_stdcpp(); __init_wut_devoptab(); if (&__init_wut_socket) __init_wut_socket(); } @@ -33,7 +31,6 @@ void __attribute__((weak)) __fini_wut_() { __fini(); __fini_wut_devoptab(); - __fini_wut_stdcpp(); __fini_wut_newlib(); __fini_wut_malloc(); } diff --git a/source/utils/SplashSoundPlayer.cpp b/source/utils/SplashSoundPlayer.cpp index c1f468b..c1f8d55 100644 --- a/source/utils/SplashSoundPlayer.cpp +++ b/source/utils/SplashSoundPlayer.cpp @@ -84,7 +84,7 @@ void SplashSoundPlayer::Play() { std::span audioBufferIn(mBuffer.data() + 8, mBuffer.size() - 8); - DEBUG_FUNCTION_LINE("Got audio buffer from foreground bucket @ %8.8x len = %d", audioBuffer, audioBufferLen); + DEBUG_FUNCTION_LINE("Got audio buffer from foreground bucket @ %p len = %d", audioBuffer, audioBufferLen); if (audioBufferLen < mBuffer.size()) { DEBUG_FUNCTION_LINE_ERR("buffer not big enough"); return; diff --git a/source/utils/gfx.c b/source/utils/gfx.c index 34e73cd..61db18a 100644 --- a/source/utils/gfx.c +++ b/source/utils/gfx.c @@ -221,7 +221,7 @@ static BOOL initBucketHeap() { sGfxHeapForeground = MEMCreateExpHeapEx(base, size, 0); if (!sGfxHeapForeground) { - DEBUG_FUNCTION_LINE_WARN("%s: MEMCreateExpHeapEx(0x%08X, 0x%X, 0)", __FUNCTION__, base, size); + DEBUG_FUNCTION_LINE_WARN("%s: MEMCreateExpHeapEx(0x%p, 0x%X, 0)", __FUNCTION__, base, size); return FALSE; }