config.mk: add FREETYPELIBS and FREETYPEINC

These variables make it simpler to change the paths to this for ports.
`pkg-config` is avoided because it sucks, in particular for cross-compilation.

A commented path for *BSD is added, the Xft includes are located at:
/usr/X11R6/include there.

Also already bump the version number to 4.6, a release will come
approximately in August.
This commit is contained in:
Hiltjo Posthuma 2015-07-19 20:32:08 +02:00
parent 1c242df124
commit 5feb0c689d

View File

@ -1,5 +1,5 @@
# dmenu version # dmenu version
VERSION = 4.5-tip VERSION = 4.6
# paths # paths
PREFIX = /usr/local PREFIX = /usr/local
@ -12,9 +12,15 @@ X11LIB = /usr/X11R6/lib
XINERAMALIBS = -lXinerama XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA 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 INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} -lfontconfig -lXft LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags # flags
CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}