Update of /cvsroot/tuxpaint/tuxpaint
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5462
Modified Files:
Makefile
Log Message:
* Exposing load_user_fonts() and some other font.c functions,
even when FORKED_FONTS is not set.
* No longer undef'ing SDL_thread stuff when FORKED_FONTS is
used if we're ALSO not using SDL_Pango, since that now
uses a thread to let fontconfig generate its cache, and
still let Tux Paint be responsive to the OS and user.
(SF.net bug #2944951)
* Spawning a thread and rendering a dummy string with SDL_Pango,
to allow fontconfig to generate its cache.
(SF.net bug #2944951)
* Setting up 'busy' mouse cursor (watch-shaped) earlier
(so it can happen while fontconfig cache thread runs).
* Not spawning forked font scanner (FORKED_FONTS) as early, so
fontconfig can generate its cache first.
(I wasn't sure if calling an SDL_thread after a fork()
occured was safe or not; admittedly, I discovered that
SDL_thread spawning wasn't working due to the re-#defines
of those functions when FORKED_FONTS was set; see above.)
All of this only tested on Ubuntu 9.04. Forced disabling of FORKED_FONTS
by editing fonts.h, and Tux Paint still worked (it just took longer at
the splash screen while the fonts were loaded). Needs testing on various
Windows, Mac OS X and BeOS.
Index: Makefile
===================================================================
RCS file: /cvsroot/tuxpaint/tuxpaint/Makefile,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- Makefile 21 Apr 2010 22:22:04 -0000 1.240
+++ Makefile 27 Apr 2010 22:04:43 -0000 1.241
@@ -244,7 +244,8 @@
# "make" with no arguments builds the program and man page from sources:
#
.PHONY: all
-all: tuxpaint translations magic-plugins tp-magic-config thumb-starters
+all: tuxpaint translations magic-plugins tp-magic-config
+# thumb-starters
@echo
@echo "--------------------------------------------------------------"
@echo
@@ -416,9 +417,10 @@
install-magic-plugin-dev \
install-icon install-gettext install-im install-importscript \
install-default-config install-example-stamps \
- install-example-starters install-thumb-starters\
+ install-example-starters \
install-bash-completion \
$(ARCH_INSTALL)
+#install-thumb-starters
@echo
@echo "--------------------------------------------------------------"
@echo
|