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 From 53d208ce4ce459506ad2de6a6860edbef49f21c4 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Wed, 28 Aug 2013 16:22:50 -0500 Subject: fail fast when the baserom.gbc file doesn't exist One day this will not be required. But until then, waiting one or more seconds for the build to fail just to learn that you forgot baserom.gbc is really silly. This makes failure almost instantaneous compared to before, which would take between one and ten seconds depending on system performance. fixes #167 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b6aa311a..54b8b57a3 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,10 @@ pokecrystal.o: $(TEXTFILES:.asm=.tx) wram.asm constants.asm $(shell find constan .asm.tx: $(eval TEXTQUEUE := $(TEXTQUEUE) $<) @rm -f $@ +baserom: + python -c "import os; assert 'baserom.gbc' in os.listdir('.'), 'Wait! Need baserom.gbc first. Check README and INSTALL for details.';" -pokecrystal.gbc: pokecrystal.o +pokecrystal.gbc: baserom pokecrystal.o rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $< rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ -- cgit v1.2.3 From 9da5768b34316e5b6a68daa9e789c8163b31d4ad Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Thu, 29 Aug 2013 11:56:20 -0500 Subject: fix baserom.gbc check in Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 54b8b57a3..00c634b3e 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ PNG_GFX := $(shell find gfx/ -type f -name '*.png') LZ_GFX := $(shell find gfx/ -type f -name '*.lz') TWOBPP_GFX := $(shell find gfx/ -type f -name '*.2bpp') -all: pokecrystal.gbc - cmp baserom.gbc $< +all: baserom.gbc pokecrystal.gbc + cmp baserom.gbc pokecrystal.gbc clean: rm -f pokecrystal.o pokecrystal.gbc @echo 'rm -f $(TEXTFILES:.asm=.tx)' @@ -19,10 +19,10 @@ pokecrystal.o: $(TEXTFILES:.asm=.tx) wram.asm constants.asm $(shell find constan .asm.tx: $(eval TEXTQUEUE := $(TEXTQUEUE) $<) @rm -f $@ -baserom: +baserom.gbc: python -c "import os; assert 'baserom.gbc' in os.listdir('.'), 'Wait! Need baserom.gbc first. Check README and INSTALL for details.';" -pokecrystal.gbc: baserom pokecrystal.o +pokecrystal.gbc: pokecrystal.o rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $< rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ -- cgit v1.2.3