(svn r8500) [0.5] -Fix: [OSX] freetype failed to be detected (now it's always enabled because Xcode installs it)
-Fix: [OSX] fontconfig is disabled even if it's found because the default one in OSX is 2.1.0 and OpenTTD needs at least 2.3.0
-Fix: FREETYPE_CONFIG is only set when it's undefined. This makes it possible to add it as argument to make
--- a/makefiledir/Makefile.libdetection Wed Jan 31 12:47:35 2007 +0000
+++ b/makefiledir/Makefile.libdetection Wed Jan 31 22:08:23 2007 +0000
@@ -67,7 +67,9 @@
LIBPNG_CONFIG :=libpng-config
# set freetype-config to the default value
+ifndef FREETYPE_CONFIG
FREETYPE_CONFIG:=freetype-config
+endif
# set pkg-config to the default value
FONTCONFIG_CONFIG:=pkg-config fontconfig
@@ -131,6 +133,11 @@
endif
ifdef OSX
+# OSX always has freetype, even though it can fail to be detected with our previous test
+# fontconfig is also present by default, but the default one is too old for OpenTTD
+# if the user installed a newer one, he/she can modify Makefile.config to enable it
+WITH_FREETYPE:=1
+WITH_FONTCONFIG:=
# we prefer to use cocoa drivers rather than SDL drivers
# if you really want SDL drivers, you can always modify Makefile.config
ifndef DEDICATED