From e84a5b2062ff5e9b010447e3a3c78dd67a653166 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sun, 1 Sep 2013 02:27:44 -0500
Subject: make extras/ a submodule

Use pokemontools v1.3.0 and use the same preprocessor as the pokecrystal
project.
---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index af6610ea..d588dacb 100644
--- a/Makefile
+++ b/Makefile
@@ -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.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES}
+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.tx ${TEXTFILES}
+pokeblue.o: pokeblue.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx}
 	rgbasm -o pokeblue.o pokeblue.asm
 
-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
-- 
cgit v1.2.3