From 78a16245a4bbf13acf53768064d81cbaa28c0d8b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 23 Apr 2019 18:22:45 +0200 Subject: auto-determine system font path and add to list of font paths This will help on non-supported platforms as it will add a path the current code might not be aware of. --- nx-X11/programs/Xserver/hw/nxagent/Font.c | 1 + nx-X11/programs/Xserver/hw/nxagent/Imakefile | 1 + 2 files changed, 2 insertions(+) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index d5c9f8982..89128d4c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -72,6 +72,7 @@ is" without express or implied warranty. #undef DEBUG const char * nxagentFontDirs[] = { + SYSTEMFONTDIR, "/usr/share/nx/fonts", "/usr/share/X11/fonts", "/usr/share/fonts/X11", diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 6e68b80fc..ddbf08fab 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -255,6 +255,7 @@ DEFINES = \ -DRANDR_15_INTERFACE=1 \ -DPANORAMIX \ -UDEBUG_TREE \ + -DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \ $(NULL) all:: $(OBJS) -- cgit v1.2.3