From 3c22ea94044d1f2f6dd6805baada8110844f6bec Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 17 Apr 2021 12:27:01 +0200 Subject: [PATCH] Use latest wut, remove logging for now --- Dockerfile | 4 ++-- source/logger.h | 2 ++ source/main.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 282fff4..8a96854 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM wiiuenv/devkitppc:20210101 +FROM wiiuenv/devkitppc:20210414 COPY --from=wiiuenv/libkernel:20210109 /artifacts $DEVKITPRO COPY --from=wiiuenv/libfunctionpatcher:20210109 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiumodulesystem:20210313 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiumodulesystem:20210414 /artifacts $DEVKITPRO WORKDIR project \ No newline at end of file diff --git a/source/logger.h b/source/logger.h index bb6d40d..fe6bdf7 100644 --- a/source/logger.h +++ b/source/logger.h @@ -19,6 +19,8 @@ extern "C" { #define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \ WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ } while (0); + +#define DEBUG_FUNCTION_LINE(FMT, ARGS...) #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \ WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ diff --git a/source/main.cpp b/source/main.cpp index f02b641..2bd09c0 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -16,7 +16,8 @@ WUMS_MODULE_SKIP_WUT_INIT(); WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(); WUMS_INITIALIZE(args) { - WHBLogUdpInit(); + // Currently we have no logging because we're skipping the wut init/fini calls. + // WHBLogUdpInit(); DEBUG_FUNCTION_LINE("Setting up memory mapping!"); static uint8_t ucSetupRequired = 1; if (!ucSetupRequired) { @@ -33,7 +34,8 @@ WUMS_INITIALIZE(args) { } WUMS_APPLICATION_STARTS() { - WHBLogUdpInit(); + // Currently we have no logging because we're skipping the wut init/fini calls. + // WHBLogUdpInit(); //MemoryMapping_DestroyHeaps(); //MemoryMapping_CreateHeaps();