diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2019-05-07 21:53:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 21:53:37 -0400 |
| commit | 140c6b0a3f56e689f85728548469402e928ade30 (patch) | |
| tree | b20ec7e05d5970bdfc7c35bfbf9c89b7541b011b /config.mk | |
| parent | 35506b44adf9176062f2cc51bcfd54ac79246744 (diff) | |
| parent | 3cd91894ec91a0de7aa71d62949ba3381e600afd (diff) | |
Merge pull request #69 from YusufAktepe/master
Updated st to 0.8.2
Diffstat (limited to 'config.mk')
| -rw-r--r-- | config.mk | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -1,5 +1,5 @@ # st version -VERSION = 0.8.1 +VERSION = 0.8.2 # Customize below to fit your system @@ -10,19 +10,26 @@ MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib +PKG_CONFIG = pkg-config + # includes and libs INCS = -I$(X11INC) \ - `pkg-config --cflags fontconfig` \ - `pkg-config --cflags freetype2` -LIBS = -L${X11LIB} -lm -lrt -lX11 -lutil -lXft -lXrender \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` + `$(PKG_CONFIG) --cflags fontconfig` \ + `$(PKG_CONFIG) --cflags freetype2` +LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \ + `$(PKG_CONFIG) --libs fontconfig` \ + `$(PKG_CONFIG) --libs freetype2` # flags -CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) +STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) STLDFLAGS = $(LIBS) $(LDFLAGS) +# OpenBSD: +#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE +#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ +# `pkg-config --libs fontconfig` \ +# `pkg-config --libs freetype2` + # compiler and linker # CC = c99 - |