Merge branch 'master' into NetHack-3.7

2019-12-15 14:56:10 -05:00
parent b956e1a205 d952eea4eb
commit caec4e39f5
4 changed files with 4 additions and 3 deletions
--- a/doc/fixes36.4
+++ b/doc/fixes36.4
@@ -23,6 +23,7 @@ Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository

 Platform- and/or Interface-Specific Fixes or Features
 -----------------------------------------------------
+fix compilation on platforms that split the ncurses and tinfo libraries


 General New Features
--- a/sys/unix/hints/linux
+++ b/sys/unix/hints/linux
@@ -47,7 +47,7 @@ WINLIB = $(WINTTYLIB) $(WINCURSESLIB)
 #WINSRC += tile.c
 #WINOBJ += tile.o

-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo

 CHOWN=true
 CHGRP=true
--- a/sys/unix/hints/linux-chroot
+++ b/sys/unix/hints/linux-chroot
@@ -39,7 +39,7 @@ WINSRC = $(WINTTYSRC)
 WINOBJ = $(WINTTYOBJ)
 WINLIB = $(WINTTYLIB)

-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo

 CHOWN=true
 CHGRP=true
--- a/sys/unix/hints/linux-minimal
+++ b/sys/unix/hints/linux-minimal
@@ -21,7 +21,7 @@ WINSRC = $(WINTTYSRC)
 WINOBJ = $(WINTTYOBJ)
 WINLIB = $(WINTTYLIB)

-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo

 CHOWN=true
 CHGRP=true