diff options
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -65,7 +65,7 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld %src/libs/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc %src/libs/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc %src/libs/libisagbprn.o: CC1 := tools/agbcc/bin/old_agbcc -%src/libs/libisagbprn.o: CFLAGS := -mthumb-interwork +%src/libs/libisagbprn.o: CC1FLAGS := -mthumb-interwork #### Main Rules #### @@ -160,9 +160,12 @@ include override.mk %.lz: % ; $(GBAGFX) $< $@ $(GFX_OPTS) %.rl: % ; $(GBAGFX) $< $@ $(GFX_OPTS) +<<<<<<< HEAD +======= #### Sound Rules #### +>>>>>>> 62042c1cbf95b3f26fba3baa4f0a339f0b663462 sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif $(AIF2PCM) $< $@ --compress |