X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=config.mk;h=4d10df473926e33b3bb345f207e5a6fe3813c9a2;hp=216e7dfd5c2bf2ca1ada1043ed6a08add6e57dbe;hb=82494f248d778e1195a9eabfac916ce08c52b6da;hpb=6db6980e27bdde6f2d444dd3cdd7a46985fa84fc

diff --git a/config.mk b/config.mk
index 216e7df..4d10df4 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.0
+VERSION = 0.3
 
 # Customize below to fit your system
 
@@ -11,18 +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
-
-# uncomment your system #
-#SYSTEM = -DLINUX
-#SYSTEM = -DOPENBSD
-#SYSTEM = -DFREEBSD
+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}\" ${SYSTEM}
-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
+