From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 10 Sep 2016 22:12:29 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:tabakrolletjie
X-Git-Tag: tabakrolletjie-v1.0.0~26
X-Git-Url: https://git.ctpug.org.za/?p=tabakrolletjie.git;a=commitdiff_plain;h=3a465d139519cc0f56a6acd06691fc5dcec9bb1f;hp=-c

Merge branch 'master' of ctpug.org.za:tabakrolletjie
---

3a465d139519cc0f56a6acd06691fc5dcec9bb1f
diff --combined data/images/Makefile
index 0e0ffff,a223f47..11ed46f
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@@ -4,10 -4,11 +4,11 @@@ SEED=see
  TURNIP=turnip1 turnip2 turnip3
  MOULD_BODY=mouldA mouldB mouldC
  MOULD=eyeballA eyeballB eyeballC eyelid
 -LIGHT=spotlight lamp laser
 +LIGHT=spotlight lamp laser pulsatinglamp
  LIGHT_MASK=light_mask_2_1 light_mask_2_2 light_mask_3_1 light_mask_3_2 light_mask_3_3
  CONTROLS=night default_cursor exit pause play day
  BLANKS=circle square
+ SPLASH=splash new_game continue_retry help quit
  
  IMG16=$(MOULD_BODY)
  IMG32=$(MOULD_BODY) $(MOULD) $(LIGHT) $(SEED) $(LIGHT_MASK) $(CONTROLS)
@@@ -21,8 -22,9 +22,9 @@@ PNG32=$(patsubst %, 32/%.png, $(IMG32)
  PNG48=$(patsubst %, 48/%.png, $(IMG48))
  PNG64=$(patsubst %, 64/%.png, $(IMG64))
  PNG_CURSORS=$(patsubst %, cursors/%.png, $(CURSORS))
+ PNG_SPLASH=$(patsubst %, splash/%.png, $(SPLASH))
  
- all: $(PNG16) $(PNG32) $(PNG48) $(PNG64) $(PNG_CURSORS)
+ all: $(PNG16) $(PNG32) $(PNG48) $(PNG64) $(PNG_CURSORS) $(PNG_SPLASH)
  
  16/%.png: %.svg
  	@mkdir -p `dirname $@`
@@@ -40,5 -42,9 +42,9 @@@
  	@mkdir -p `dirname $@`
  	@inkscape -z -e $@ -w 64 -h 64 $<
  
+ splash/%.png: %.svg
+ 	@mkdir -p `dirname $@`
+ 	@inkscape -z -e $@ $<
+ 
  cursors/%.png: 32/%.png
  	@cp $< $@