notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2019-10-19 17:08:37 +02:00
commit be761daf7c
4 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -4,7 +4,7 @@
# Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/
# June 14, 2002 - September 14, 2019
# June 14, 2002 - September 25, 2019
# The version number, for release:
@ -709,9 +709,9 @@ $(THUMB_STARTERS):
@mkdir -p starters/.thumbs
@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
then \
composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp.png ; \
convert $(CONVERT_OPTS) obj/tmp.png $@ ; \
rm obj/tmp.png ; \
composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \
rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
else \
convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \
fi