diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-09-16 13:12:42 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-09-16 13:12:42 -0400 |
| commit | 4000d7a23ab9a9d46bea6e937ab12d63c3194b89 (patch) | |
| tree | d7f66337ea36fb300f7fc053ba572d05995b5a2f /Makefile | |
| parent | give consistency to map names (diff) | |
| parent | revert pokemontools to 7aa016fb (diff) | |
| download | pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.gz pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.xz pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.zip | |
Merge branch 'master' into comments
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -1,17 +1,16 @@ .SUFFIXES: .asm .tx .o .gbc -TEXTFILES = text/oakspeech.tx text/pokedex.tx text/mapRedsHouse1F.tx \ - text/mapBluesHouse.tx text/mapPalletTown.tx +TEXTFILES := $(shell find ./ -type f -name '*.asm') all: pokered.gbc -pokered.o: pokered.asm main.tx constants.asm ${TEXTFILES} - rgbasm -o pokered.o pokered.asm +pokered.o: pokered.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx} + rgbasm -o pokered.o pokered.tx -pokeblue.o: pokeblue.asm main.tx constants.asm ${TEXTFILES} - rgbasm -o pokeblue.o pokeblue.asm +pokeblue.o: pokeblue.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx} + rgbasm -o pokeblue.o pokeblue.tx -redrle: extras/redrle.c +redrle: extras/redtools/redrle.c ${CC} -o $@ $> .asm.tx: @@ -28,6 +27,6 @@ pokeblue.gbc: pokeblue.o cmp blue.gbc $@ clean: - rm -f main.tx pokered.o pokered.gbc pokeblue.o pokeblue.gbc redrle ${TEXTFILES} + rm -f pokered.o pokered.gbc pokeblue.o pokeblue.gbc redrle $(TEXTFILES:.asm=.tx) more: pokered.gbc pokeblue.gbc |