8fff967390b185e152a6faf2a7335e5db23a9ff7 braney Tue May 25 14:27:48 2021 -0700 use the freetype configuration utility to decide whether or not to use it. diff --git src/inc/common.mk src/inc/common.mk index d19526f..5f7e7ca 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -16,33 +16,41 @@ endif ifneq (,$(findstring -,$(MACHTYPE))) # $(info MACHTYPE has - sign ${MACHTYPE}) MACHTYPE:=$(shell uname -m) # $(info MACHTYPE has - sign set to: ${MACHTYPE}) endif HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE} HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I$(kentSrc)/htslib # to check for Mac OSX Darwin specifics: UNAME_S := $(shell uname -s) # to check for builds on hgwdev HOSTNAME = $(shell uname -n) +FREETYPECFLAGS = $(shell freetype-config --cflags 2> /dev/null) +FREETYPELIBS = $(shell freetype-config --libs 2> /dev/null ) +ifneq (${FREETYPECFLAGS},) +FREETYPECFLAGS += -DUSE_FREETYPE +endif + +HG_INC += ${FREETYPECFLAGS} +L += ${FREETYPELIBS} + ifeq (${HOSTNAME},hgwdev) IS_HGWDEV = yes - HG_INC+=-I/usr/include/freetype2 -DUSE_FREETYPE else IS_HGWDEV = no endif ifeq (${IS_HGWDEV},yes) FULLWARN = yes endif ifeq (${HOSTNAME},cirm-01) FULLWARN = yes endif ifeq (${PTHREADLIB},) PTHREADLIB=-lpthread endif