Convert map to use Xft

This commit is contained in:
Ray Chason
2026-08-19 09:37:40 +03:00
committed by Pasi Kallinen
parent d44b6385d7
commit fbc586bf44
6 changed files with 341 additions and 42 deletions
+5
View File
@@ -397,6 +397,7 @@ endif # MAKEFILE_SRC
ifdef WANT_WIN_X11
USE_XPM=1
USE_XFT=1
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
ifndef CROSSCOMPILE
@@ -408,6 +409,10 @@ POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR);
X11CFLAGS = -I/opt/X11/include
# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
X11CFLAGS += -Wno-variadic-macros
ifdef USE_XFT
X11CFLAGS += -DUSE_XFT $(shell pkg-config --cflags xft fontconfig)
WINX11LIB += $(shell pkg-config --libs xft fontconfig)
endif
ifdef USE_XPM
CFLAGS += -DUSE_XPM
WINX11LIB += -lXpm
+5
View File
@@ -277,6 +277,7 @@ HINTOBJ=$(CHAINOBJ)
endif # WANT_WIN_CHAIN
ifdef WANT_WIN_X11
USE_XFT=1
USE_XPM=1
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
@@ -287,6 +288,10 @@ POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR);
X11CFLAGS = -I/opt/X11/include
# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
X11CFLAGS += -Wno-variadic-macros
ifdef USE_XFT
X11CFLAGS += -DUSE_XFT $(shell pkg-config --cflags xft fontconfig)
WINX11LIB += $(shell pkg-config --libs xft fontconfig)
endif
ifdef USE_XPM
CFLAGS += -DUSE_XPM
WINX11LIB += -lXpm