From 2875ab4fcf5c5f81d76353d1ee0024c9ea8d0b23 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Aug 2023 18:48:52 -0400 Subject: [PATCH] Emulator related changes in the makefile (#1528) * emu related changes to make file * spaces * add error * remove unwanted file (thanks ares) --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3d6f626347..5f5b628c90 100644 --- a/Makefile +++ b/Makefile @@ -95,8 +95,8 @@ AS := $(MIPS_BINUTILS_PREFIX)as LD := $(MIPS_BINUTILS_PREFIX)ld OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump -EMULATOR = mupen64plus -EMU_FLAGS = --noosd +EMULATOR ?= +EMU_FLAGS ?= INC := -Iinclude -Isrc -Ibuild -I. @@ -269,11 +269,14 @@ setup: python3 extract_baserom.py python3 extract_assets.py -j$(N_THREADS) -test: $(ROM) +run: $(ROM) +ifeq ($(EMULATOR),) + $(error Emulator path not set. Set EMULATOR in the Makefile or define it as an environment variable) +endif $(EMULATOR) $(EMU_FLAGS) $< -.PHONY: all clean setup test distclean assetclean +.PHONY: all clean setup run distclean assetclean #### Various Recipes ####