diff --git a/Dockerfile b/Dockerfile index 8a96854..55efe4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM wiiuenv/devkitppc:20210414 +FROM wiiuenv/devkitppc:20210917 COPY --from=wiiuenv/libkernel:20210109 /artifacts $DEVKITPRO COPY --from=wiiuenv/libfunctionpatcher:20210109 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiumodulesystem:20210414 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiumodulesystem:20210917 /artifacts $DEVKITPRO WORKDIR project \ No newline at end of file diff --git a/Makefile b/Makefile index 74a9452..02ea820 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ $(BUILD): #------------------------------------------------------------------------------- clean: @echo clean ... - @rm -fr $(BUILD) $(TARGET).rpx $(TARGET).elf + @rm -fr $(BUILD) $(TARGET).wms $(TARGET).elf #------------------------------------------------------------------------------- else diff --git a/source/logger.h b/source/logger.h index fe6bdf7..bb6d40d 100644 --- a/source/logger.h +++ b/source/logger.h @@ -19,8 +19,6 @@ 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 2bd09c0..9ee9c88 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -12,12 +12,10 @@ WUMS_MODULE_EXPORT_NAME("homebrew_memorymapping"); WUMS_MODULE_SKIP_ENTRYPOINT(); -WUMS_MODULE_SKIP_WUT_INIT(); WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(); WUMS_INITIALIZE(args) { - // Currently we have no logging because we're skipping the wut init/fini calls. - // WHBLogUdpInit(); + WHBLogUdpInit(); DEBUG_FUNCTION_LINE("Setting up memory mapping!"); static uint8_t ucSetupRequired = 1; if (!ucSetupRequired) { @@ -34,8 +32,7 @@ WUMS_INITIALIZE(args) { } WUMS_APPLICATION_STARTS() { - // Currently we have no logging because we're skipping the wut init/fini calls. - // WHBLogUdpInit(); + WHBLogUdpInit(); //MemoryMapping_DestroyHeaps(); //MemoryMapping_CreateHeaps();