From 7080b0c428dc54fecc750f254e68eb5c4006dc7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Fri, 14 May 2021 19:14:15 -0400
Subject: [PATCH] scale.o and xbr.o are (basically) required by bitmap now.

---
 src/conio/GNUmakefile | 6 +++---
 src/conio/objects.mk  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/conio/GNUmakefile b/src/conio/GNUmakefile
index 04a86f256d..547cc689cb 100644
--- a/src/conio/GNUmakefile
+++ b/src/conio/GNUmakefile
@@ -16,8 +16,6 @@ ifdef NO_X
 else
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)x_events$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)x_cio$(OFILE) \
-			$(MTOBJODIR)$(DIRSEP)scale$(OFILE) \
-			$(MTOBJODIR)$(DIRSEP)xbr$(OFILE)
  NEED_BITMAP := 1
 endif
 
@@ -38,7 +36,9 @@ ifeq ($(shell if [ -e /usr/include/ncursesw/ncurses.h ] ; then echo YES ; fi),YE
 endif
 
 ifdef NEED_BITMAP
- OBJS	+=	$(MTOBJODIR)$(DIRSEP)bitmap_con$(OFILE)
+ OBJS	+=	$(MTOBJODIR)$(DIRSEP)bitmap_con$(OFILE) \
+		$(MTOBJODIR)$(DIRSEP)scale$(OFILE) \
+		$(MTOBJODIR)$(DIRSEP)xbr$(OFILE)
 endif
 
 # CIOLIB Library Link Rule
diff --git a/src/conio/objects.mk b/src/conio/objects.mk
index b5a513acac..0ce6f3c87b 100644
--- a/src/conio/objects.mk
+++ b/src/conio/objects.mk
@@ -4,6 +4,5 @@ OBJS	=	$(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)vidmodes$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)mouse$(OFILE)\
-			$(MTOBJODIR)$(DIRSEP)scale$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)syncicon64$(OFILE)\
 			$(MTOBJODIR)$(DIRSEP)utf8_codepages$(OFILE)
-- 
GitLab