diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-01-09 18:49:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 12:49:12 -0500 |
| commit | 8a09f33c8fbbaaa31ef8726757f4bf53dd156a16 (patch) | |
| tree | ba46c75f04270a7d7e1637acfaea11adea93ad43 | |
| parent | cd917b0cb8c20e457d43805ee27d2597daed63e3 (diff) | |
Makefile: Change `EMULATOR :=` to `N64_EMULATOR ?=` (#1608)
* ``EMULATOR :=`` -> ``N64_EMULATOR ?=``
* change other instances of EMULATOR and removed EMU_FLAGS
* missing one EMULATOR
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -101,12 +101,12 @@ ifeq ($(ORIG_COMPILER),1) CC_OLD = $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc endif -AS := $(MIPS_BINUTILS_PREFIX)as -LD := $(MIPS_BINUTILS_PREFIX)ld -OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy -OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump -EMULATOR := -EMU_FLAGS := +AS := $(MIPS_BINUTILS_PREFIX)as +LD := $(MIPS_BINUTILS_PREFIX)ld +OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy +OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump + +N64_EMULATOR ?= INC := -Iinclude -Iinclude/libc -Isrc -I$(BUILD_DIR) -I. @@ -282,10 +282,10 @@ setup: python3 extract_assets.py -j$(N_THREADS) run: $(ROM) -ifeq ($(EMULATOR),) - $(error Emulator path not set. Set EMULATOR in the Makefile or define it as an environment variable) +ifeq ($(N64_EMULATOR),) + $(error Emulator path not set. Set N64_EMULATOR in the Makefile or define it as an environment variable) endif - $(EMULATOR) $(EMU_FLAGS) $< + $(N64_EMULATOR) $< .PHONY: all clean setup run distclean assetclean |