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

Getting --uppercase working (mostly) without Pango, too.

Browse source 
No longer aborting build when Pango is disabled or not found.
This commit is contained in:
William Kendrick 2008-05-29 16:06:07 +00:00
parent 5d1204f83c
commit e4e06ad2a4
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -4,7 +4,7 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - May 28, 2008 # June 14, 2002 - May 29, 2008
# The version number, for release: # The version number, for release:
@ -162,7 +162,11 @@ NOSOUNDFLAG:=$(if $(SDL_MIXER_LIB),,-DNOSOUND$(warning -lSDL_Mixer failed, no so
# SDL Pango is needed to render complex scripts like Thai and Arabic # SDL Pango is needed to render complex scripts like Thai and Arabic
SDL_PANGO_LIB:=$(call linktest,-lSDL_Pango,$(SDL_LIBS)) SDL_PANGO_LIB:=$(call linktest,-lSDL_Pango,$(SDL_LIBS))
NOPANGOFLAG:=$(if $(SDL_PANGO_LIB),,-DNO_SDLPANGO$(warning -lSDL_Pango failed, no scripts for you!)) NOPANGOFLAG:=$(if $(SDL_PANGO_LIB),,-DNO_SDLPANGO)
# Unnecessary to die, I think... INSTALL.txt says we can disable! -bjk 2008.05.29
# $(warning -lSDL_Pango failed, no scripts for you!))
SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL_PANGO_LIB) SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL_PANGO_LIB)

4
src/tuxpaint.c
View file

@ -10191,7 +10191,7 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color,
{ {
if (only_uppercase) if (only_uppercase)
{ {
wchar * upper_utf8_str = uppercase_w(utf8_str); char * upper_utf8_str = uppercase((char *) utf8_str);
text = render_text(myfont, (char *) upper_utf8_str, color); text = render_text(myfont, (char *) upper_utf8_str, color);
free(upper_utf8_str); free(upper_utf8_str);
} }
@ -10399,7 +10399,7 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color,
if (only_uppercase) if (only_uppercase)
{ {
char uppercase_substr = uppercase(substr); char * uppercase_substr = uppercase(substr);
text = render_text(myfont, uppercase_substr, color); text = render_text(myfont, uppercase_substr, color);
free(uppercase_substr); free(uppercase_substr);
} }