X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.mk;h=ecc5c833989b5fbb4d50aaa6f528acc0c3ff7395;hb=7d32471efffa825f52d24930b5ee617105f9c83e;hp=2827e980d9ae39cc983f7140ace949401afe81c4;hpb=c56332857145d1c6741d4f6c1bbc87dcc6c6ab97;p=st.git

diff --git a/config.mk b/config.mk
index 2827e98..ecc5c83 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,17 +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
+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}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
+CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += -g ${LIBS}
 
 # compiler and linker
-CC = cc
+CC ?= cc
+