mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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
release/0.6
bjarni 2006-12-25 09:50:56 +00:00
parent 8e20ae2e95
commit 0cfecfbe3c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -101,6 +101,8 @@
# CYGWIN: build in Cygwin environment # CYGWIN: build in Cygwin environment
# MINGW: build with MingW compiler, link with MingW libraries # 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 # VERBOSE: show full compiler invocations instead of brief progress messages
# #
# Special for crosscompiling there are some commands available: # Special for crosscompiling there are some commands available:
@ -523,6 +525,13 @@ ifdef WITH_FONTCONFIG
CDEFS += -DWITH_FONTCONFIG CDEFS += -DWITH_FONTCONFIG
CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags) CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags)
LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs) 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) CFLAGS += $(CCFLAGS_FONTCONFIG)
LIBS += $(LDFLAGS_FONTCONFIG) LIBS += $(LDFLAGS_FONTCONFIG)
endif endif