7216fbf3ffc72cb77bf509c0bffe719a1daa0ed5 braney Sun Sep 6 16:20:34 2020 -0700 first cut at using FreeType for font support diff --git src/inc/common.mk src/inc/common.mk index a8fe6c5..33a2a6f 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -15,30 +15,31 @@ # $(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 + HG_INC+=-I/usr/include/freetype2 else IS_HGWDEV = no endif ifeq (${IS_HGWDEV},yes) FULLWARN = yes endif ifeq (${HOSTNAME},cirm-01) FULLWARN = yes endif ifeq (${PTHREADLIB},) PTHREADLIB=-lpthread endif @@ -89,31 +90,31 @@ ifeq (${USE_HIC},1) HG_DEFS+=-DUSE_HIC endif # libssl: disabled by default ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) ifneq ($(wildcard ${SSL_DIR}),) L+=-L${SSL_DIR}/lib endif endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. ifeq (${IS_HGWDEV},yes) - L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl + L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl -lfreetype else ifneq ($(wildcard /opt/local/lib/libssl.a),) L+=/opt/local/lib/libssl.a else ifneq ($(wildcard /usr/lib/x86_64-linux-gnu/libssl.a),) L+=/usr/lib/x86_64-linux-gnu/libssl.a else ifneq ($(wildcard /usr/local/opt/openssl/lib/libssl.a),) L+=/usr/local/opt/openssl/lib/libssl.a else L+=-lssl endif endif endif ifneq ($(wildcard /opt/local/lib/libcrypto.a),)