X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.mk;h=88355c714f4aadc43644726c029235f65ed74b7a;hb=de4cd2f6afdf450aaa97abb328f4c4849602c7db;hp=46efc0c26d0096c5e9ed92613d5e223f8dff6f06;hpb=ae5baac932af877cb18df6853d45f033ed9b270f;p=st.git diff --git a/config.mk b/config.mk index 46efc0c..88355c7 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # st version -VERSION = 0.0 +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} -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil +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 = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS = -s ${LIBS} +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 +CC ?= cc +