summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-01-26 23:09:34 -0700
committerIIMarckus <iimarckus@gmail.com>2014-01-26 23:09:34 -0700
commit6bfe2f42381deecf254542842d7c312d777062fc (patch)
tree455a40e198aa136a23f3a98f8099569d2e7f9896 /Makefile
parent27c5fe339f0e09c1c0d56e04aca24a994579f95e (diff)
parent7e4febba58e2ad2ca0cec38785ae44eed571f160 (diff)
Merge branch 'text' of https://github.com/yenatch/pokered
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a61875e9..f889f2aa 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,16 @@ TEXTQUEUE :=
RED_OBJS := \
pokered.o \
-audio_red.o
+audio_red.o \
+text.o
BLUE_OBJS := \
pokeblue.o \
-audio_blue.o
+audio_blue.o \
+text.o
OBJS := $(RED_OBJS) $(BLUE_OBJS)
+OBJS := $(sort $(OBJS))
ROMS := pokered.gbc pokeblue.gbc