diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:58:48 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:58:48 -0500 |
| commit | ec84c9227bf70ff9e668a6dc7d1f712ca5911b57 (patch) | |
| tree | 3852df3b04c9c309aed923ca7425d82744393187 | |
| parent | 8b41179e9349ac3dcc98f2436be2fa70f5040a33 (diff) | |
| parent | 62042c1cbf95b3f26fba3baa4f0a339f0b663462 (diff) | |
merge
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -160,6 +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 |