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

Merge branch 'master' of ssh://git.code.sf.net:/p/tuxpaint/tuxpaint

Browse source
This commit is contained in:
Mark K. Kim 2018-02-10 20:31:36 -05:00
commit f96720de80
24 changed files with 4559 additions and 4897 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,10 +1,10 @@
# Tux Paint - A simple drawing program for children.
# Copyright (c) 2002-2016 by Bill Kendrick and others
# Copyright (c) 2002-2017 by Bill Kendrick and others
# bill@newbreedsoftware.com
# http://www.tuxpaint.org/
# June 14, 2002 - December 11, 2016
# June 14, 2002 - December 30, 2017
# The version number, for release:
@ -317,7 +317,7 @@ build/tuxpaint-$(VER_VERSION):
@echo
@mkdir -p build/tuxpaint-$(VER_VERSION)
@find . -follow \
\( -wholename '*/CVS' -o -name .thumbs -o -name .cvsignore -o -name 'dummy.o' -o -name 'build' -o -name '.#*' \) \
\( -wholename '*/.git' -o -name .gitignore -o -name .thumbs -o -name .cvsignore -o -name 'dummy.o' -o -name 'build' -o -name '.#*' \) \
-prune -o -type f -exec cp --parents -vdp \{\} build/tuxpaint-$(VER_VERSION)/ \;
.PHONY: release
@ -894,7 +894,7 @@ install-dlls:
@cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX)
@cp `which libstdc++-6.dll` $(BIN_PREFIX)
@cp `which libfribidi-0.dll` $(BIN_PREFIX)
@cp `which libpthread-2.dll` $(BIN_PREFIX)
@cp `which libwinpthread-1.dll` $(BIN_PREFIX)
@if [ "x$(BDIST_WIN9X)" == "x" ]; then \
cp `which libxml2-2.dll` $(BIN_PREFIX); \
cp `which libcairo-2.dll` $(BIN_PREFIX); \