diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-12-17 19:15:58 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-12-17 19:15:58 -0500 |
| commit | 5429ef6348af7a3a4521e7806dff9ac64b0e9a63 (patch) | |
| tree | 1d6bae2087eb980efb0dff3a47ab83f65b1428f8 /Makefile | |
| parent | 05dd8e6ec0d60ff816e61dddc98be79defd7fe48 (diff) | |
| parent | ec3b2ac58135c2e97fc708487bbcdd47c9ac427b (diff) | |
Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -103,9 +103,9 @@ OBJDUMP := $(CROSS)objdump OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o -ASFLAGS = -proc arm5te -CFLAGS = -O4,p -gccext,on -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/libc/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -W all -LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start +MWASFLAGS = -proc arm5te +MWCFLAGS = -O4,p -gccext,on -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/libc/include -ir arm9/lib/libnns/include -ir arm9/lib/NitroSDK/include -W all +MWLDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start ####################### Other Tools ######################### @@ -205,10 +205,10 @@ $(BUILD_DIR)/%.o: dep := endif $(BUILD_DIR)/%.o: %.c $$(dep) - $(CC) -c $(CFLAGS) -o $@ $< + $(CC) -c $(MWCFLAGS) -o $@ $< $(BUILD_DIR)/%.o: %.s $$(dep) - $(AS) $(ASFLAGS) $< -o $@ + $(AS) $(MWASFLAGS) $< -o $@ arm9: filesystem $(MAKE) -C arm9 $(MAKE_VARS) |