summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfig.mk9
-rwxr-xr-xdrw.c10
-rw-r--r--drw.obin11512 -> 11352 bytes
-rwxr-xr-xdwmbin75272 -> 75192 bytes
-rw-r--r--dwm.obin64600 -> 64600 bytes
5 files changed, 11 insertions, 8 deletions
diff --git a/config.mk b/config.mk
index 5e8e0e0..6858260 100755
--- a/config.mk
+++ b/config.mk
@@ -7,8 +7,10 @@ VERSION = 6.3
PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+# X11INC = /usr/X11R6/include
+# X11LIB = /usr/X11R6/lib
+X11INC = /home/cafebabe/.local/src/libxft/include
+X11LIB = /home/cafebabe/.local/src/libxft/src/.libs
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
@@ -30,7 +32,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-r
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = ${LIBS}
+# LDFLAGS = ${LIBS}
+LDFLAGS = -Xlinker -rpath=$(X11LIB) $(LIBS)
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/drw.c b/drw.c
index 85fe42f..dc16902 100755
--- a/drw.c
+++ b/drw.c
@@ -140,11 +140,11 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
* and lots more all over the internet. */
- FcBool iscol;
- if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
- XftFontClose(drw->dpy, xfont);
- return NULL;
- }
+ /* FcBool iscol; */
+ /* if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { */
+ /* XftFontClose(drw->dpy, xfont); */
+ /* return NULL; */
+ /* } */
font = ecalloc(1, sizeof(Fnt));
font->xfont = xfont;
diff --git a/drw.o b/drw.o
index e3d1a47..8d0f352 100644
--- a/drw.o
+++ b/drw.o
Binary files differ
diff --git a/dwm b/dwm
index 07b5b54..4d0d151 100755
--- a/dwm
+++ b/dwm
Binary files differ
diff --git a/dwm.o b/dwm.o
index c117218..ab93013 100644
--- a/dwm.o
+++ b/dwm.o
Binary files differ