From 067d7c1e2e978b182bcbb1dc7ce17c354ae3c730 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 28 Nov 2005 05:44:46 +0000
Subject: [PATCH] Since cterm uses the fontdata all over the place
 unconditionally (Should this be fixed), we need allfonts to be included for
 all ciolib builds.

---
 src/conio/GNUmakefile | 5 -----
 src/conio/Makefile    | 1 -
 src/conio/objects.mk  | 1 +
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/conio/GNUmakefile b/src/conio/GNUmakefile
index d442296763..ce3279e439 100644
--- a/src/conio/GNUmakefile
+++ b/src/conio/GNUmakefile
@@ -16,11 +16,6 @@ endif
 ifdef WITH_SDL
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE)
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
- OBJS	+=	$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
-else
- ifndef NO_X
-  OBJS	+=	$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
- endif
 endif
 
 ifeq ($(os),netbsd)
diff --git a/src/conio/Makefile b/src/conio/Makefile
index 8e175bbbad..a9ba2718a5 100644
--- a/src/conio/Makefile
+++ b/src/conio/Makefile
@@ -24,7 +24,6 @@ SRC_ROOT = ..
 OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
 OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 !endif
-OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)
 
 #The following is necessary only when DLL-exporting wrapper functions
 !ifdef DLLIBS
diff --git a/src/conio/objects.mk b/src/conio/objects.mk
index f52d79f506..4420d44e24 100644
--- a/src/conio/objects.mk
+++ b/src/conio/objects.mk
@@ -2,4 +2,5 @@ OBJS	=	$(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)ciolib$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)cterm$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)vidmodes$(OFILE)\
+			$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)mouse$(OFILE)
-- 
GitLab