cf8ff2ea2319888ff5b5befeecfb014cb14a11be hiram Wed Aug 4 14:38:09 2021 -0700 use static freetype lib on Mac OSX refs #27906 diff --git src/inc/common.mk src/inc/common.mk index 89803ed..68ba051 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -26,32 +26,36 @@ # to check for Mac OSX Darwin specifics: UNAME_S := $(shell uname -s) # to check for builds on hgwdev HOSTNAME = $(shell uname -n) ifeq (${HOSTNAME},hgwdev) IS_HGWDEV = yes else IS_HGWDEV = no endif FREETYPECFLAGS = $(shell freetype-config --cflags 2> /dev/null) # we use our static library on dev ifeq (${IS_HGWDEV},no) + ifeq ($(UNAME_S),Darwin) + FREETYPELIBS = /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a /usr/local/opt/bzip2/lib/libbz2.a + else FREETYPELIBS = $(shell freetype-config --libs 2> /dev/null ) endif +endif ifneq (${FREETYPECFLAGS},) FREETYPECFLAGS += -DUSE_FREETYPE endif HG_INC += ${FREETYPECFLAGS} L += ${FREETYPELIBS} ifeq (${IS_HGWDEV},yes) FULLWARN = yes endif ifeq (${HOSTNAME},cirm-01) FULLWARN = yes endif