diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2020-10-20 13:08:42 -0500 |
|---|---|---|
| committer | Seth Barberee <seth.barberee@gmail.com> | 2020-10-20 13:08:42 -0500 |
| commit | 0271952426117ba1c95b2f4156a8b555104bfa1c (patch) | |
| tree | e400c95ab03b48368ae36f13711ecb1c0ca56d5d /Makefile | |
| parent | a0aac0e9d22251550fc01bc899d3144639072d3e (diff) | |
| parent | 8834fdd3e24e7904973af4ca160c1badbf5bb31a (diff) | |
Merge remote-tracking branch 'nullablevoid/master' into master
Port m4a from pokeemerald into pmd-red
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -63,8 +63,7 @@ $(BUILD_DIR)/src/agb_flash.o : CC1FLAGS := -O -mthumb-interwork $(BUILD_DIR)/src/agb_flash_1m.o: CC1FLAGS := -O -mthumb-interwork $(BUILD_DIR)/src/agb_flash_mx.o: CC1FLAGS := -O -mthumb-interwork -$(BUILD_DIR)/src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc -$(BUILD_DIR)/src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc +$(BUILD_DIR)/src/m4a.o: CC1 := tools/agbcc/bin/old_agbcc #### Main Rules #### |