Commit dca879a3 authored by Deucе's avatar Deucе 👌🏾
Browse files

scale.o and xbr.o are (basically) required by bitmap now.

parent 9aca9bf4
Pipeline #2186 failed with stage
in 5 minutes and 57 seconds
...@@ -16,8 +16,6 @@ ifdef NO_X ...@@ -16,8 +16,6 @@ ifdef NO_X
else else
OBJS += $(MTOBJODIR)$(DIRSEP)x_events$(OFILE) \ OBJS += $(MTOBJODIR)$(DIRSEP)x_events$(OFILE) \
$(MTOBJODIR)$(DIRSEP)x_cio$(OFILE) \ $(MTOBJODIR)$(DIRSEP)x_cio$(OFILE) \
$(MTOBJODIR)$(DIRSEP)scale$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xbr$(OFILE)
NEED_BITMAP := 1 NEED_BITMAP := 1
endif endif
...@@ -38,7 +36,9 @@ ifeq ($(shell if [ -e /usr/include/ncursesw/ncurses.h ] ; then echo YES ; fi),YE ...@@ -38,7 +36,9 @@ ifeq ($(shell if [ -e /usr/include/ncursesw/ncurses.h ] ; then echo YES ; fi),YE
endif endif
ifdef NEED_BITMAP ifdef NEED_BITMAP
OBJS += $(MTOBJODIR)$(DIRSEP)bitmap_con$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)bitmap_con$(OFILE) \
$(MTOBJODIR)$(DIRSEP)scale$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xbr$(OFILE)
endif endif
# CIOLIB Library Link Rule # CIOLIB Library Link Rule
......
...@@ -4,6 +4,5 @@ OBJS = $(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\ ...@@ -4,6 +4,5 @@ OBJS = $(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\
$(MTOBJODIR)$(DIRSEP)vidmodes$(OFILE)\ $(MTOBJODIR)$(DIRSEP)vidmodes$(OFILE)\
$(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)\ $(MTOBJODIR)$(DIRSEP)allfonts$(OFILE)\
$(MTOBJODIR)$(DIRSEP)mouse$(OFILE)\ $(MTOBJODIR)$(DIRSEP)mouse$(OFILE)\
$(MTOBJODIR)$(DIRSEP)scale$(OFILE)\
$(MTOBJODIR)$(DIRSEP)syncicon64$(OFILE)\ $(MTOBJODIR)$(DIRSEP)syncicon64$(OFILE)\
$(MTOBJODIR)$(DIRSEP)utf8_codepages$(OFILE) $(MTOBJODIR)$(DIRSEP)utf8_codepages$(OFILE)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment