summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
commita08d9dd451dd87a24b833eef2d3c09daae2a524d (patch)
tree024875f0465dea995ea30a0d30adf2cd73f4d87a /Makefile
parent8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 (diff)
parent095cbbc5c297055d2cb2c01a2c8c04dc7d055cb6 (diff)
Merge branch 'master' into anims
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3c2c333b0..d9f3ec4c7 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ tidy:
rm -r build/*
include graphics_file_rules.mk
-include event_obj_graphics_makefile_rules.mk
+include spritesheet_rules.mk
%.s: ;
%.png: ;
@@ -173,5 +173,5 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
- $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION)
+ $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent