Reenable logging, Update Dockerfile to use WUMS 0.2

This commit is contained in:
Maschell 2021-09-17 18:19:32 +02:00
parent 3c22ea9404
commit 18a2889a36
4 changed files with 5 additions and 10 deletions

View File

@ -1,7 +1,7 @@
FROM wiiuenv/devkitppc:20210414 FROM wiiuenv/devkitppc:20210917
COPY --from=wiiuenv/libkernel:20210109 /artifacts $DEVKITPRO COPY --from=wiiuenv/libkernel:20210109 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libfunctionpatcher: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 WORKDIR project

View File

@ -103,7 +103,7 @@ $(BUILD):
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
clean: clean:
@echo clean ... @echo clean ...
@rm -fr $(BUILD) $(TARGET).rpx $(TARGET).elf @rm -fr $(BUILD) $(TARGET).wms $(TARGET).elf
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
else else

View File

@ -20,8 +20,6 @@ extern "C" {
WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
} while (0); } while (0);
#define DEBUG_FUNCTION_LINE(FMT, ARGS...)
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \ #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \
WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
} while (0); } while (0);

View File

@ -12,12 +12,10 @@
WUMS_MODULE_EXPORT_NAME("homebrew_memorymapping"); WUMS_MODULE_EXPORT_NAME("homebrew_memorymapping");
WUMS_MODULE_SKIP_ENTRYPOINT(); WUMS_MODULE_SKIP_ENTRYPOINT();
WUMS_MODULE_SKIP_WUT_INIT();
WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(); WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK();
WUMS_INITIALIZE(args) { 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!"); DEBUG_FUNCTION_LINE("Setting up memory mapping!");
static uint8_t ucSetupRequired = 1; static uint8_t ucSetupRequired = 1;
if (!ucSetupRequired) { if (!ucSetupRequired) {
@ -34,8 +32,7 @@ WUMS_INITIALIZE(args) {
} }
WUMS_APPLICATION_STARTS() { WUMS_APPLICATION_STARTS() {
// Currently we have no logging because we're skipping the wut init/fini calls. WHBLogUdpInit();
// WHBLogUdpInit();
//MemoryMapping_DestroyHeaps(); //MemoryMapping_DestroyHeaps();
//MemoryMapping_CreateHeaps(); //MemoryMapping_CreateHeaps();