X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.mk;h=88355c714f4aadc43644726c029235f65ed74b7a;hb=1e7816c2023f48728e15cc4128ad8be163986902;hp=20e519fe6b8060a4dde6f95fbd35d3cd869b8d5a;hpb=b0ed3e289730e42195f3388ffcc437e6cb3b8377;p=st.git diff --git a/config.mk b/config.mk index 20e519f..88355c7 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # st version -VERSION = 0.3 +VERSION = 0.4 # Customize below to fit your system @@ -11,13 +11,18 @@ X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # includes and libs -INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2 -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig +INCS = -I. -I/usr/include -I${X11INC} \ + $(shell pkg-config --cflags fontconfig) \ + $(shell pkg-config --cflags freetype2) +LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \ + $(shell pkg-config --libs fontconfig) \ + $(shell pkg-config --libs freetype2) # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} +CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600 +CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS} LDFLAGS += -g ${LIBS} # compiler and linker CC ?= cc +