mirror of https://github.com/OpenTTD/OpenTTD.git
(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
This commit is contained in:
parent
47c158bbc5
commit
5467635bf9
|
@ -67,7 +67,9 @@ SDL_CONFIG:=sdl-config
|
||||||
LIBPNG_CONFIG :=libpng-config
|
LIBPNG_CONFIG :=libpng-config
|
||||||
|
|
||||||
# set freetype-config to the default value
|
# set freetype-config to the default value
|
||||||
|
ifndef FREETYPE_CONFIG
|
||||||
FREETYPE_CONFIG:=freetype-config
|
FREETYPE_CONFIG:=freetype-config
|
||||||
|
endif
|
||||||
|
|
||||||
# set pkg-config to the default value
|
# set pkg-config to the default value
|
||||||
FONTCONFIG_CONFIG:=pkg-config fontconfig
|
FONTCONFIG_CONFIG:=pkg-config fontconfig
|
||||||
|
@ -131,6 +133,11 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef OSX
|
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
|
# we prefer to use cocoa drivers rather than SDL drivers
|
||||||
# if you really want SDL drivers, you can always modify Makefile.config
|
# if you really want SDL drivers, you can always modify Makefile.config
|
||||||
ifndef DEDICATED
|
ifndef DEDICATED
|
||||||
|
|
Loading…
Reference in New Issue