diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 16:24:02 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 16:24:38 -0500 |
| commit | 08ac6dfd80000f1cdd449225e4d2cc195e086439 (patch) | |
| tree | fc85edcb9de974408b99c6e26562798442cd6c08 /Makefile | |
| parent | 1176712cfebba527fac1438fdf8ca8b9e643a8e7 (diff) | |
*_crystal.asm files are no longer needed to build crystal *.o.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -16,12 +16,12 @@ main11.o \ lib/mobile/main.o \ home.o \ audio.o \ -maps_crystal.o \ -engine/events_crystal.o \ -engine/credits_crystal.o \ -data/egg_moves_crystal.o \ -data/evos_attacks_crystal.o \ -data/pokedex/entries_crystal.o \ +maps.o \ +engine/events.o \ +engine/credits.o \ +data/egg_moves.o \ +data/evos_attacks.o \ +data/pokedex/entries.o \ misc/crystal_misc.o \ text/common_text.o \ gfx/pics.o @@ -32,12 +32,12 @@ main.o \ lib/mobile/main.o \ home.o \ audio.o \ -maps_crystal.o \ -engine/events_crystal.o \ -engine/credits_crystal.o \ -data/egg_moves_crystal.o \ -data/evos_attacks_crystal.o \ -data/pokedex/entries_crystal.o \ +maps.o \ +engine/events.o \ +engine/credits.o \ +data/egg_moves.o \ +data/evos_attacks.o \ +data/pokedex/entries.o \ misc/crystal_misc.o \ text/common_text.o \ gfx/pics.o @@ -69,6 +69,10 @@ compare: pokecrystal.gbc pokecrystal11.gbc %.o: %.asm $$(%_dep) rgbasm -o $@ $< +# This seems to be required because of a filename collision (but not a path collision). +lib/%.o: lib/%.asm $$(lib/%_dep) + rgbasm -o $@ $< + pokecrystal11.gbc: $(crystal11_obj) rgblink -n $*.sym -m $*.map -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ |