From e4e06ad2a4601db719428bea3b2a9f84d728ae9a Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Thu, 29 May 2008 16:06:07 +0000 Subject: [PATCH] Getting --uppercase working (mostly) without Pango, too. No longer aborting build when Pango is disabled or not found. --- Makefile | 8 ++++++-- src/tuxpaint.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 36bf0e13a..91ead338a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # bill@newbreedsoftware.com # http://www.tuxpaint.org/ -# June 14, 2002 - May 28, 2008 +# June 14, 2002 - May 29, 2008 # 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_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) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index cc749081c..09a86a3cd 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -10191,7 +10191,7 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color, { 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); free(upper_utf8_str); } @@ -10399,7 +10399,7 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color, if (only_uppercase) { - char uppercase_substr = uppercase(substr); + char * uppercase_substr = uppercase(substr); text = render_text(myfont, uppercase_substr, color); free(uppercase_substr); }