From b8c76b96a516175b220fdb2c672f0c0e51298b16 Mon Sep 17 00:00:00 2001 From: Wolfywolfy Date: Tue, 3 Dec 2024 17:50:42 -0300 Subject: [PATCH] Fix VMC compile support. --- Makefile | 8 ++++---- modules/pademu/pademu.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2a8c6c66e..2ff13f921 100644 --- a/Makefile +++ b/Makefile @@ -156,9 +156,9 @@ ifeq ($(PADEMU),1) IOP_OBJS += pademu.o ds34usb.o ds34bt.o libds34usb.a libds34bt.a EE_CFLAGS += -DPADEMU EE_INCS += -Imodules/ds34bt/ee -Imodules/ds34usb/ee - PADEMU_FLAGS = PADEMU=1 + PADEMU_FLAGS = PADEMU=1 VMC=1 else - PADEMU_FLAGS = PADEMU=0 + PADEMU_FLAGS = PADEMU=0 VMC=1 endif ifeq ($(DEBUG),1) @@ -328,7 +328,7 @@ clean: download_lwNBD echo " -ds34bt" $(MAKE) -C modules/ds34bt clean echo " -pademu" - $(MAKE) -C modules/pademu USE_DS3=1 USE_DS4=1 clean + $(MAKE) -C modules/pademu USE_DS3=1 USE_DS4=1 VMC=1 clean echo "-pc tools" $(MAKE) -C pc clean @@ -521,7 +521,7 @@ $(EE_ASM_DIR)ds34usb.c: modules/ds34usb/iop/ds34usb.irx | $(EE_ASM_DIR) $(BIN2C) $< $@ $(*F)_irx modules/pademu/pademu.irx: modules/pademu - $(MAKE) USE_DS3=1 USE_DS4=1 -C $< all + $(MAKE) USE_DS3=1 USE_DS4=1 VMC=1 -C $< all $(EE_ASM_DIR)pademu.c: modules/pademu/pademu.irx $(BIN2C) $< $@ $(*F)_irx diff --git a/modules/pademu/pademu.c b/modules/pademu/pademu.c index 3e3301c3e..a182dcbcb 100644 --- a/modules/pademu/pademu.c +++ b/modules/pademu/pademu.c @@ -126,6 +126,7 @@ int _start(int argc, char *argv[]) SetRebootTimeLibraryHandlingMode(&_exp_pademu, 2); +#ifdef VMC u8 vmc = 0; if (argc > 1) @@ -135,6 +136,7 @@ int _start(int argc, char *argv[]) if (!install_sio2hook()) return MODULE_NO_RESIDENT_END; } +#endif pademu_setup(pad_enable, pad_vibration);