Xinqi Bao's Git
projects
/
dwm.git
/ commitdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
14343e6
)
config.mk: add $FREETYPELIBS and $FREETYPEINC, simpler to override (ports and *BSDs)
author
Hiltjo Posthuma <
[email protected]
>
Tue, 20 Oct 2015 21:01:49 +0000
(23:01 +0200)
committer
Hiltjo Posthuma <
[email protected]
>
Tue, 20 Oct 2015 21:01:49 +0000
(23:01 +0200)
config.mk
patch
|
blob
|
history
diff --git
a/config.mk
b/config.mk
index
cf95913
..
4eefb71
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-14,9
+14,15
@@
X11LIB = /usr/X11R6/lib
XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA
XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA
+# freetype
+FREETYPELIBS = -lfontconfig -lXft
+FREETYPEINC = /usr/include/freetype2
+# OpenBSD (uncomment)
+#FREETYPEINC = ${X11INC}/freetype2
+
# includes and libs
# includes and libs
-INCS = -I${X11INC} -I
/usr/include/freetype2
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
-lfontconfig -lXft
+INCS = -I${X11INC} -I
${FREETYPEINC}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
${FREETYPELIBS}
# flags
CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
# flags
CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}