From b4e8ec0901da238bf89ef8685355403a6960c29d Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 23 Jan 2014 15:55:33 -0500 Subject: Make text.asm an object --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a61875e9..6c673590 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,13 @@ 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) -- cgit v1.3.1-sl0p From 896cc790d1c6b3ce1d84ec74df2199069ef42aed Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 23 Jan 2014 18:18:07 -0500 Subject: Makefile: remove duplicates when consolidating objects --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6c673590..f889f2aa 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ audio_blue.o \ text.o OBJS := $(RED_OBJS) $(BLUE_OBJS) +OBJS := $(sort $(OBJS)) ROMS := pokered.gbc pokeblue.gbc -- cgit v1.3.1-sl0p