dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.

Browse Source
This commit is contained in:
rubidium
2006-11-17 22:15:55 +00:00
parent f2cda44d2e
commit bd129cf6bf
5 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -241,6 +241,12 @@ $(error WITH_FREETYPE can't be used when FREETYPE_CONFIG is not set. Edit Makefi
endif
endif
ifdef WITH_FONTCONFIG
ifndef FONTCONFIG_CONFIG
$(error WITH_FONTCONFIG can't be used when FONTOCNFIG_CONFIG is not set. Edit Makefile.config to correct this)
endif
endif
##############################################################################
#
# Compiler configuration
@@ -508,6 +514,15 @@ CFLAGS += $(CCFLAGS_FREETYPE)
LIBS += $(LDFLAGS_FREETYPE)
endif
# fontconfig config
ifdef WITH_FONTCONFIG
CDEFS += -DWITH_FONTCONFIG
CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags)
LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs)
CFLAGS += $(CCFLAGS_FONTCONFIG)
LIBS += $(LDFLAGS_FONTCONFIG)
endif
# iconv is enabled defaultly on OSX >= 10.3
ifdef OSX
ifndef JAGUAR