da47fe7e559f64f870af274fe6ae2b0ff89354ba hiram Fri Sep 24 14:17:21 2021 -0700 restore previous behavior for freetype libs on hgwdev no redmine diff --git src/inc/common.mk src/inc/common.mk index e189d76..d200b43 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -25,51 +25,50 @@ # 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 (${FREETYPELIBS},) ifeq (${IS_HGWDEV},no) + ifeq (${FREETYPELIBS},) ifeq ($(UNAME_S),Darwin) ifneq ($(wildcard /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a),) ifneq ($(wildcard /usr/local/opt/bzip2/lib/libbz2.a),) FREETYPELIBS = /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a /usr/local/opt/bzip2/lib/libbz2.a else FREETYPELIBS = /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a -lbz2 endif else ifneq ($(wildcard /opt/local/lib/libfreetype.a),) FREETYPELIBS=/opt/local/lib/libfreetype.a /opt/local/lib/libbz2.a /opt/local/lib/libbrotlidec-static.a /opt/local/lib/libbrotlienc-static.a /opt/local/lib/libbrotlicommon-static.a endif endif endif - endif -endif - ifeq (${FREETYPELIBS},) FREETYPELIBS = $(shell freetype-config --libs 2> /dev/null ) endif + 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