Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwkendrick <wkendrick>2008-05-29 16:06:07 (GMT)
committer wkendrick <wkendrick>2008-05-29 16:06:07 (GMT)
commitdee1bc756e801053ade7c70d1c8bec54b08a6090 (patch)
treedea8ba74670432738749afa878e6ddd3068052df /Makefile
parentba8b1b01684414ae64247bf94439d4abb1edf9a4 (diff)
Getting --uppercase working (mostly) without Pango, too.
No longer aborting build when Pango is disabled or not found.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 36bf0e1..91ead33 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)