7d1c9114915734afc25cb3da5a611bcf387c0bc3 braney Thu Jun 3 12:07:51 2021 -0700 use our local static copy of freetype on dev for the moment. Using the distributed one is slightly changing the images, which needs to be examined more closely diff --git src/inc/common.mk src/inc/common.mk index 5f7e7ca..89803ed 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -16,45 +16,50 @@ 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) +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) FREETYPELIBS = $(shell freetype-config --libs 2> /dev/null ) +endif + ifneq (${FREETYPECFLAGS},) FREETYPECFLAGS += -DUSE_FREETYPE endif HG_INC += ${FREETYPECFLAGS} L += ${FREETYPELIBS} -ifeq (${HOSTNAME},hgwdev) - IS_HGWDEV = yes -else - IS_HGWDEV = no -endif - ifeq (${IS_HGWDEV},yes) FULLWARN = yes endif ifeq (${HOSTNAME},cirm-01) FULLWARN = yes endif ifeq (${PTHREADLIB},) PTHREADLIB=-lpthread endif # required extra library on Mac OSX ICONVLIB=