Mercurial > hg > openttd
changeset 5372:d0dde9d99921 draft
(svn r7557) -Fix: [OSX] FS#463 libfontconfig not present on OSX by default
By adding CUSTOM_FONTCONFIG flag to the Makefile (not Makefile.config) to overwrite default locations of this library
This allows static linking
author | bjarni <bjarni@openttd.org> |
---|---|
date | Mon, 25 Dec 2006 09:50:56 +0000 |
parents | 4912bfd260a4 |
children | c1617dd54bab |
files | Makefile |
diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -101,6 +101,8 @@ # CYGWIN: build in Cygwin environment # MINGW: build with MingW compiler, link with MingW libraries # +# CUSTOM_FONTCONFIG: use a custom name/path to the libfontconfig library. Useful for static linking +# # VERBOSE: show full compiler invocations instead of brief progress messages # # Special for crosscompiling there are some commands available: @@ -523,6 +525,13 @@ CDEFS += -DWITH_FONTCONFIG CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags) LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs) + +ifdef CUSTOM_FONTCONFIG +# To allow usage of non-default libs, such as absolute path to static libs +# not stored in Makefile.config +LDFLAGS_FONTCONFIG := $(CUSTOM_FONTCONFIG) +endif + CFLAGS += $(CCFLAGS_FONTCONFIG) LIBS += $(LDFLAGS_FONTCONFIG) endif