summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-08-31 21:57:56 +0100
committerGitHub <noreply@github.com>2020-08-31 21:57:56 +0100
commit6891309e08e30a744561d42e347e2dbe2de3eab8 (patch)
tree19fa922dbfedc4be863aeb5b36f51f76d076fc6e /Makefile
parentbf25a361cd0d013beb86a936b516957b66cfa011 (diff)
parent392f50eea4375637f23a4abc8643f525ba98f469 (diff)
Merge pull request #276 from PikalaxALT/pikalax_work
Trainer parties to json; trainer frontpics to png; refactor graphics rules
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile42
1 files changed, 13 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 37095e69..881aa3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -247,41 +247,25 @@ PADDED_LZ_FILES := $(addsuffix .lz,$(wildcard \
$(PADDED_LZ_FILES): %.lz: %
$(NTRCOMP) -l2 -s -A4 -o $@ $<
-%.NCGR: %.png
- $(GFX) $< $@
-
-$(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png
- $(GFX) $< $@ -clobbersize
+$(CLOBBER_SIZE_NCGR_FILES): GFX_FLAGS = -clobbersize
+$(CLOBBER_SIZE_VERSION101_NCGR_FILES): GFX_FLAGS = -clobbersize -version101
+$(VERSION101_SOPC_8BPP_NCGR_FILES): GFX_FLAGS = -version101 -sopc -bitdepth 8
+$(VERSION101_SOPC_NCGR_FILES): GFX_FLAGS = -version101 -sopc
+$(SCANNED_NCGR_FILES): GFX_FLAGS = -scanned
-$(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
- $(GFX) $< $@ -clobbersize -version101
+$(IR_NCLR_FILES): GFX_FLAGS = -ir
+$(4BPP_NCLR_FILES): GFX_FLAGS = -bitdepth 4
+$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10
+$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10
-$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png
- $(GFX) $< $@ -version101 -sopc -bitdepth 8
-
-$(VERSION101_SOPC_NCGR_FILES): %.NCGR: %.png
- $(GFX) $< $@ -version101 -sopc
-
-$(SCANNED_NCGR_FILES): %.NCGR: %.png
- $(GFX) $< $@ -scanned
+%.NCGR: %.png
+ $(GFX) $< $@ $(GFX_FLAGS)
%.NCLR: %.png
- $(GFX) $< $@
+ $(GFX) $< $@ $(GFX_FLAGS)
%.NCLR: %.pal
- $(GFX) $< $@
-
-$(IR_NCLR_FILES): %.NCLR: %.pal
- $(GFX) $< $@ -ir
-
-$(4BPP_NCLR_FILES): %.NCLR: %.pal
- $(GFX) $< $@ -bitdepth 4
-
-$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): %.NCLR: %.png
- $(GFX) $< $@ -bitdepth 8 -nopad -comp 10
-
-$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): %.NCLR: %.pal
- $(GFX) $< $@ -bitdepth 8 -nopad -comp 10
+ $(GFX) $< $@ $(GFX_FLAGS)
%.png: ;
%.pal: ;