summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-22 15:29:11 -0800
committerYamaArashi <shadow962@live.com>2015-11-22 15:29:11 -0800
commit3e95160b25c59e2e73f9872dd713ea9859bab0c4 (patch)
treeaec9fe61c7571ca0063781095af12fe9b6a70931 /Makefile
parenta14b6543746ae468a85590b1ecfc0eb7352b37d6 (diff)
tilesets
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 062f422ec..c6f0e129a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@ SHA1 := sha1sum -c
.PHONY: rom tools gbagfx scaninc clean compare
gfx := tools/gbagfx/gbagfx
-1bpp := $(gfx) 1bpp
-4bpp := $(gfx) 4bpp
-8bpp := $(gfx) 8bpp
-gbapal := $(gfx) gbapal
-lz := $(gfx) lz
+1bpp := @$(gfx) 1bpp
+4bpp := @$(gfx) 4bpp
+8bpp := @$(gfx) 8bpp
+gbapal := @$(gfx) gbapal
+lz := @$(gfx) lz
scaninc := tools/scaninc/scaninc
objs = asm/emerald.o
@@ -52,11 +52,11 @@ include graphics_file_rules.mk
%.png: ;
%.pal: ;
-%.1bpp: %.png ; @$(1bpp) $<
-%.4bpp: %.png ; @$(4bpp) $<
-%.8bpp: %.png ; @$(8bpp) $<
-%.gbapal: %.pal ; @$(gbapal) $<
-%.lz: % ; @$(lz) $<
+%.1bpp: %.png ; $(1bpp) $<
+%.4bpp: %.png ; $(4bpp) $<
+%.8bpp: %.png ; $(8bpp) $<
+%.gbapal: %.pal ; $(gbapal) $<
+%.lz: % ; $(lz) $<
%.o: %.s $$($$@_deps)
$(AS) $(ASFLAGS) -o $@ $<