From a94257c7f8b4497a3695c142fd15972ff9e21b63 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 18:40:02 -0500 Subject: update Makefile for the new gfx.py path Why isn't the build breaking? --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d66ab3257..c62c4b4aa 100644 --- a/Makefile +++ b/Makefile @@ -25,21 +25,21 @@ pokecrystal.gbc: pokecrystal.o rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ pngs: - cd extras && python gfx.py mass-decompress && python gfx.py dump-pngs + cd extras/pokemontools/ && python gfx.py mass-decompress && python gfx.py dump-pngs lzs: $(LZ_GFX) $(TWOBPP_GFX) @: gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp - python extras/gfx.py png-to-lz --front $^ + python extras/pokemontools/gfx.py png-to-lz --front $^ gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png - python extras/gfx.py png-to-2bpp $< + python extras/pokemontools/gfx.py png-to-2bpp $< gfx/pics/%/back.lz: gfx/pics/%/back.png - python extras/gfx.py png-to-lz --vert $< + python extras/pokemontools/gfx.py png-to-lz --vert $< gfx/trainers/%.lz: gfx/trainers/%.png - python extras/gfx.py png-to-lz --vert $< + python extras/pokemontools/gfx.py png-to-lz --vert $< .png.lz: - python extras/gfx.py png-to-lz $< + python extras/pokemontools/gfx.py png-to-lz $< .png.2bpp: - python extras/gfx.py png-to-lz $< + python extras/pokemontools/gfx.py png-to-lz $< -- cgit v1.2.3 From 268a2d28fdbacf48ea5e9d0cbac37ac4deee7082 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 20:13:37 -0500 Subject: probably fix the pngs target for make Update the submodule to a version where gfx.py is able to handle the current paths. Make some other fixes to Makefile to call gfx.py correctly. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c62c4b4aa..cd63e435c 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,8 @@ pokecrystal.gbc: pokecrystal.o rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ pngs: - cd extras/pokemontools/ && python gfx.py mass-decompress && python gfx.py dump-pngs + python extras/pokemontools/gfx.py mass-decompress + python extras/pokemontools/gfx.py dump-pngs lzs: $(LZ_GFX) $(TWOBPP_GFX) @: -- cgit v1.2.3