summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h2
-rw-r--r--config.mk21
-rwxr-xr-xstbin110088 -> 110088 bytes
-rw-r--r--x.obin78784 -> 78784 bytes
4 files changed, 11 insertions, 12 deletions
diff --git a/config.h b/config.h
index 4cf6218..4a0e704 100644
--- a/config.h
+++ b/config.h
@@ -7,7 +7,7 @@
*/
static char *font = "Hack Nerd Font:pixelsize=14:antialias=true:autohint=true";
/* Spare fonts*/
-static char *font2[] = { "Symbola:pixelsize14:antialias=true:autohint=true" };
+static char *font2[] = { "Symbola:pixelsize10:antialias=true:autohint=true" };
static int borderpx = 2;
/*
diff --git a/config.mk b/config.mk
index 480a98e..8bb98e0 100644
--- a/config.mk
+++ b/config.mk
@@ -7,8 +7,10 @@ VERSION = 0.9
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
PKG_CONFIG = pkg-config
@@ -16,19 +18,16 @@ PKG_CONFIG = pkg-config
INCS = -I$(X11INC) \
`$(PKG_CONFIG) --cflags fontconfig` \
`$(PKG_CONFIG) --cflags freetype2`
-# LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-# `$(PKG_CONFIG) --libs fontconfig` \
-# `$(PKG_CONFIG) --libs freetype2`
-#
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \
- -Wl,-rpath=/usr/local/lib \
- `$(PKG_CONFIG) --libs fontconfig` \
- `$(PKG_CONFIG) --libs freetype2` \
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+ `$(PKG_CONFIG) --libs fontconfig` \
+ `$(PKG_CONFIG) --libs freetype2`
+
# flags
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
+# STLDFLAGS = $(LIBS) $(LDFLAGS)
+STLDFLAGS = -Xlinker -rpath=$(X11LIB) $(LIBS) $(LDFLAGS)
# OpenBSD:
#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
diff --git a/st b/st
index 54c287f..58fe51b 100755
--- a/st
+++ b/st
Binary files differ
diff --git a/x.o b/x.o
index 69e67a6..b7e4659 100644
--- a/x.o
+++ b/x.o
Binary files differ