Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Main
Synchronet
Compare Revisions
9aca9bf4b603144ffb46a09fc171a5ba5ffddd48...dca879a34bdac1359029cfaf470e70f8bbc3e9c2
Commits (1)
scale.o and xbr.o are (basically) required by bitmap now.
· dca879a3
Deucе
authored
May 14, 2021
dca879a3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/conio/GNUmakefile
src/conio/GNUmakefile
+3
-3
src/conio/objects.mk
src/conio/objects.mk
+0
-1
No files found.
src/conio/GNUmakefile
View file @
dca879a3
...
...
@@ -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
...
...
src/conio/objects.mk
View file @
dca879a3
...
...
@@ -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)