summaryrefslogtreecommitdiff
path: root/makefiledir
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2006-11-17 22:15:55 +0000
committerrubidium <rubidium@openttd.org>2006-11-17 22:15:55 +0000
commitbd129cf6bf59d62896fec327a3b5677f74bbb606 (patch)
treef7d122025647f602c6b732895a8d7570773ba14f /makefiledir
parentf2cda44d2e3c55069279ad3e03aeb5d2a7f0f35c (diff)
downloadopenttd-bd129cf6bf59d62896fec327a3b5677f74bbb606.tar.xz
(svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
Diffstat (limited to 'makefiledir')
-rw-r--r--makefiledir/Makefile.config_writer2
-rw-r--r--makefiledir/Makefile.libdetection6
2 files changed, 8 insertions, 0 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index fad5c78f2..49b54e4f8 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -74,6 +74,7 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
$(call CONFIG_LINE,WITH_FREETYPE:=$(WITH_FREETYPE))
+ $(call CONFIG_LINE,WITH_FONTCONFIG:=$(WITH_FONTCONFIG))
$(call CONFIG_LINE,)
$(call CONFIG_LINE,\# OS flags)
@@ -102,6 +103,7 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG))
$(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG))
$(call CONFIG_LINE,FREETYPE_CONFIG:=$(FREETYPE_CONFIG))
+ $(call CONFIG_LINE,FONTCONFIG_CONFIG:=$(FONTCONFIG_CONFIG))
$(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER))
$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index a5160a309..eb38ffd47 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -69,6 +69,9 @@ LIBPNG_CONFIG :=libpng-config
# set freetype-config to the default value
FREETYPE_CONFIG:=freetype-config
+# set pkg-config to the default value
+FONTCONFIG_CONFIG:=pkg-config fontconfig
+
# Networking, enabled by default
WITH_NETWORK:=1
@@ -81,6 +84,9 @@ WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
# Freetype detection
WITH_FREETYPE:=$(shell $(FREETYPE_CONFIG) --ftversion 2>/dev/null)
+# fontconfig detection
+WITH_FONTCONFIG:=$(shell $(FONTCONFIG_CONFIG) --modversion 2>/dev/null)
+
ifdef WITH_PNG
# LibPNG depends on Zlib
WITH_ZLIB:=1