X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fimages%2FMakefile;h=3cac6205d7c305ec2e8bed5d2d541678c38794c2;hb=455a4b9a6d1687e48b847a1232cc25d13064dd71;hp=d5aa40507df3b5e4ef0cda5163c951d714e63a6e;hpb=2e7a7b5cc603f406a1b88a911d9d935a2e017ef2;p=koperkapel.git

diff --git a/koperkapel/images/Makefile b/koperkapel/images/Makefile
index d5aa405..3cac620 100644
--- a/koperkapel/images/Makefile
+++ b/koperkapel/images/Makefile
@@ -2,7 +2,7 @@ VPATH=../../sources
 
 # Vector tiles
 
-TILE_DIRS=roach
+TILE_DIRS=roach serum vehicle_tiles
 TILE_SVGS=$(shell find $(patsubst %, $(VPATH)/vector/%, $(TILE_DIRS)) -name "*.svg")
 TILE_PNGS=$(patsubst $(VPATH)/vector/%.svg, %.png, $(TILE_SVGS))
 
@@ -10,7 +10,7 @@ TILE_PNGS=$(patsubst $(VPATH)/vector/%.svg, %.png, $(TILE_SVGS))
 
 BTILE_DIRS=wall floor tunnel underground
 BTILE_SRC=$(shell find $(patsubst %, $(VPATH)/bitmap/%, $(BTILE_DIRS)) -name "*.png")
-BTILE_PNGS=$(patsubst $(VPATH)/bitmap/%, %, $(BTILE_SRC))
+BTILE_PNGS=$(patsubst $(VPATH)/bitmap/%, bunker/%, $(BTILE_SRC))
 
 # Vector images to rasterize without resizing
 
@@ -25,11 +25,18 @@ ROACH_32=$(patsubst roach/%, roach_32/%, $(ROACH))
 ROACH_21=$(patsubst roach/%, roach_21/%, $(ROACH))
 ROACH_QUARTET=$(patsubst roach/%, roach_quartet/%, $(ROACH))
 ROACH_NONET=$(patsubst roach/%, roach_nonet/%, $(ROACH))
+ROACH_BIG=$(patsubst roach/%, roach_big/%, $(ROACH))
+
+# Aggregate serum sprites
+
+SERUM=$(filter serum/%, $(TILE_PNGS))
+SERUM_BIG=$(patsubst serum/%, serum_big/%, $(SERUM))
 
 # Default target with everything
 
 all: $(TILE_PNGS) $(BTILE_PNGS) $(SIMPLE_PNGS)\
-	$(ROACH_32) $(ROACH_21) $(ROACH_QUARTET) $(ROACH_NONET)
+	$(ROACH_32) $(ROACH_21) $(ROACH_QUARTET) $(ROACH_NONET) $(ROACH_BIG)\
+	$(SERUM_BIG)
 
 # Vector tile rule
 
@@ -54,9 +61,9 @@ $(foreach simpledir,$(SIMPLE_DIRS),$(eval $(call simple,$(simpledir))))
 # Bitmap tile rule
 
 define btile
-$(1)/%.png: bitmap/$(1)/%.png
-	@mkdir -p `dirname bunker/$$@`
-	@convert $$< -resize 64x64 bunker/$$@
+bunker/$(1)/%.png: bitmap/$(1)/%.png
+	@mkdir -p `dirname $$@`
+	@convert $$< -resize 64x64 $$@
 endef
 
 $(foreach tiledir,$(BTILE_DIRS),$(eval $(call btile,$(tiledir))))
@@ -71,6 +78,18 @@ roach_21/%.png: vector/roach/%.svg
 	@mkdir -p `dirname $@`
 	@inkscape -z -e $@ -w 21 -h 21 $<
 
+# Big roaches
+
+roach_big/%.png: vector/roach/%.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 192 -h 192 $<
+
+# Big serums
+
+serum_big/%.png: vector/serum/%.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 192 -h 192 $<
+
 # Roach quartet
 
 roach_quartet/roach_%.png: $(foreach i, 1 2 3 4, roach_32/roach_$(i).png)