mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
Fix makefile to work with import scripts again (+ minor cleanups) (#171)
This commit is contained in:
parent
02fc5287cc
commit
77a9f9c9f8
1 changed files with 4 additions and 6 deletions
10
Makefile
10
Makefile
|
@ -103,14 +103,14 @@ build/src/code/fault_drawer.o: OPTFLAGS := -O2 -g3
|
|||
build/src/code/code_801068B0.o: OPTFLAGS := -g
|
||||
build/src/code/code_80106860.o: OPTFLAGS := -g
|
||||
build/src/code/code_801067F0.o: OPTFLAGS := -g
|
||||
build/src/libultra_code/llcvt.o: OPTFLAGS := -O1
|
||||
build/src/libultra_code/llcvt.o: MIPS_VERSION := -mips3 -32
|
||||
|
||||
# Todo: split libultra_code into libultra_code_O1, etc..
|
||||
build/src/libultra_code/sqrt.o: OPTFLAGS := -O2 -g3
|
||||
build/src/libultra_code/absf.o: OPTFLAGS := -O2 -g3
|
||||
build/src/libultra_code/osSetTimer.o: OPTFLAGS := -O1
|
||||
build/src/libultra_code/osStopTimer.o: OPTFLAGS := -O1
|
||||
build/src/libultra_code/llcvt.o: OPTFLAGS := -O1
|
||||
build/src/libultra_code/llcvt.o: MIPS_VERSION := -mips3 -32
|
||||
|
||||
build/src/libultra_boot_O1/%.o: CC := $(CC_OLD)
|
||||
build/src/libultra_boot_O2/%.o: CC := $(CC_OLD)
|
||||
|
@ -118,7 +118,6 @@ build/src/libultra_boot_O2/%.o: CC := $(CC_OLD)
|
|||
build/src/libultra_code/%.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) --
|
||||
build/src/code/jpegutils.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) --
|
||||
|
||||
|
||||
build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||
build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||
build/src/overlays/actors/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
|
||||
|
@ -183,7 +182,7 @@ build/assets/%.o: assets/%.c
|
|||
build/src/overlays/%.o: src/overlays/%.c
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^
|
||||
$(CC_CHECK) $^
|
||||
$(ZAP2) bovl -i $@ -cfg $^ -o $(@:.o=_reloc.s)
|
||||
$(ZAP2) bovl -i $@ -cfg $^ --outputpath $(@:.o=_reloc.s)
|
||||
-test -f $(@:.o=_reloc.s) && $(AS) $(ASFLAGS) $(@:.o=_reloc.s) -o $(@:.o=_reloc.o)
|
||||
@$(OBJDUMP) -d $@ > $(@:.o=.s)
|
||||
|
||||
|
@ -192,7 +191,6 @@ build/src/%.o: src/%.c
|
|||
$(CC_CHECK) $^
|
||||
@$(OBJDUMP) -d $@ > $(@:.o=.s)
|
||||
|
||||
|
||||
build/src/libultra_code/llcvt.o: src/libultra_code/llcvt.c
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^
|
||||
$(CC_CHECK) $^
|
||||
|
@ -233,4 +231,4 @@ build/src/libultra_code/llcvt.o: src/libultra_code/llcvt.c
|
|||
# $(ZAP2) btex ci4 $< $@
|
||||
|
||||
#build/assets/%.ci8: assets/%.ci8.png
|
||||
# $(ZAP2) btex ci8 $< $@
|
||||
# $(ZAP2) btex ci8 $< $@
|
||||
|
|
Loading…
Reference in a new issue