From 0c0fda90598863400a5d44f65617e24024b720e0 Mon Sep 17 00:00:00 2001 From: dcc Date: Fri, 12 Jan 2024 17:09:23 -0800 Subject: multilib is correct now --- bdmenu-based/.config.mk.un~ | Bin 0 -> 589 bytes bdmenu-based/config.mk | 2 +- bdmenu-based/config.mk~ | 31 +++++++++++++++++++++++++++++++ bdmenu-based/dmenu | Bin 42384 -> 48192 bytes bdmenu-based/dmenu.o | Bin 38336 -> 35504 bytes bdmenu-based/drw.o | Bin 16016 -> 10080 bytes bdmenu-based/stest | Bin 10080 -> 21416 bytes bdmenu-based/stest.o | Bin 5800 -> 5016 bytes bdmenu-based/util.o | Bin 2592 -> 2208 bytes 9 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 bdmenu-based/.config.mk.un~ create mode 100755 bdmenu-based/config.mk~ (limited to 'bdmenu-based') diff --git a/bdmenu-based/.config.mk.un~ b/bdmenu-based/.config.mk.un~ new file mode 100755 index 0000000..04ba808 Binary files /dev/null and b/bdmenu-based/.config.mk.un~ differ diff --git a/bdmenu-based/config.mk b/bdmenu-based/config.mk index 57afe4d..ebd8e96 100755 --- a/bdmenu-based/config.mk +++ b/bdmenu-based/config.mk @@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -FREETYPEINC = $(X11INC)/freetype2 +#FREETYPEINC = $(X11INC)/freetype2 # includes and libs INCS = -I$(X11INC) -I$(FREETYPEINC) diff --git a/bdmenu-based/config.mk~ b/bdmenu-based/config.mk~ new file mode 100755 index 0000000..57afe4d --- /dev/null +++ b/bdmenu-based/config.mk~ @@ -0,0 +1,31 @@ +# dmenu version +VERSION = 5.1 + +# paths +PREFIX = /usr/local +MANPREFIX = $(PREFIX)/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# Xinerama, comment if you don't want it +XINERAMALIBS = -lXinerama -lXrender +XINERAMAFLAGS = -DXINERAMA + +# freetype +FREETYPELIBS = -lfontconfig -lXft +FREETYPEINC = /usr/include/freetype2 +# OpenBSD (uncomment) +FREETYPEINC = $(X11INC)/freetype2 + +# includes and libs +INCS = -I$(X11INC) -I$(FREETYPEINC) +LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +LDFLAGS = $(LIBS) + +# compiler and linker +CC = cc diff --git a/bdmenu-based/dmenu b/bdmenu-based/dmenu index 86a0d6b..c7912f2 100755 Binary files a/bdmenu-based/dmenu and b/bdmenu-based/dmenu differ diff --git a/bdmenu-based/dmenu.o b/bdmenu-based/dmenu.o index 8e83e6c..665f1b2 100644 Binary files a/bdmenu-based/dmenu.o and b/bdmenu-based/dmenu.o differ diff --git a/bdmenu-based/drw.o b/bdmenu-based/drw.o index 0619a4b..8c38889 100644 Binary files a/bdmenu-based/drw.o and b/bdmenu-based/drw.o differ diff --git a/bdmenu-based/stest b/bdmenu-based/stest index 43bca64..b9ec0e9 100755 Binary files a/bdmenu-based/stest and b/bdmenu-based/stest differ diff --git a/bdmenu-based/stest.o b/bdmenu-based/stest.o index 77ae22a..5284664 100644 Binary files a/bdmenu-based/stest.o and b/bdmenu-based/stest.o differ diff --git a/bdmenu-based/util.o b/bdmenu-based/util.o index 1189f70..91daf38 100644 Binary files a/bdmenu-based/util.o and b/bdmenu-based/util.o differ -- cgit v1.2.3