mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: Change EMULATOR := to N64_EMULATOR ?= (#1608)

Browse source 
* ``EMULATOR :=`` -> ``N64_EMULATOR ?=``

* change other instances of EMULATOR and removed EMU_FLAGS

* missing one EMULATOR
This commit is contained in:
Yanis42 2024-01-09 18:49:12 +01:00 committed by GitHub
parent cd917b0cb8
commit 8a09f33c8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -101,12 +101,12 @@ ifeq ($(ORIG_COMPILER),1)
CC_OLD = $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc CC_OLD = $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
endif endif
AS := $(MIPS_BINUTILS_PREFIX)as AS := $(MIPS_BINUTILS_PREFIX)as
LD := $(MIPS_BINUTILS_PREFIX)ld LD := $(MIPS_BINUTILS_PREFIX)ld
OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
EMULATOR :=
EMU_FLAGS := N64_EMULATOR ?=
INC := -Iinclude -Iinclude/libc -Isrc -I$(BUILD_DIR) -I. INC := -Iinclude -Iinclude/libc -Isrc -I$(BUILD_DIR) -I.
@ -282,10 +282,10 @@ setup:
python3 extract_assets.py -j$(N_THREADS) python3 extract_assets.py -j$(N_THREADS)
run: $(ROM) run: $(ROM)
ifeq ($(EMULATOR),) ifeq ($(N64_EMULATOR),)
$(error Emulator path not set. Set EMULATOR in the Makefile or define it as an environment variable) $(error Emulator path not set. Set N64_EMULATOR in the Makefile or define it as an environment variable)
endif endif
$(EMULATOR) $(EMU_FLAGS) $< $(N64_EMULATOR) $<
.PHONY: all clean setup run distclean assetclean .PHONY: all clean setup run distclean assetclean