diff --git a/sys/unix/hints/include/compiler.370 b/sys/unix/hints/include/compiler.370 index a4a7e06e2..75ac7d1ed 100755 --- a/sys/unix/hints/include/compiler.370 +++ b/sys/unix/hints/include/compiler.370 @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# NetHack 3.7 compiler.370 $NHDT-Date: 1637992237 2021/11/27 05:50:37 $ $NHDT-Branch: NetHack-3.7 $ +# NetHack 3.7 compiler.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $ # compiler flags: CCFLAGS is used to construct a value for CFLAGS with # various -I, -D, and -W settings appended below; @@ -133,24 +133,5 @@ CCXXFLAGS+=-Wno-deprecated-declarations endif # WANT_WIN_QT endif # clang-specific ends here -ifdef MAKEFILE_SRC -ifdef WANT_WIN_QT -# when switching from Qt5 to Qt6 or vice versa, any old .moc files will be -# incompatible; get rid of them in case user hasn't run 'make spotless'; -# object files are incompatable with Qt library, so get rid of them too; -# Qt*.h-t are empty timestamp files and at most one should exist -QTany_H = Qt*.h-t -ifdef WANT_WIN_QT6 -# Qt 6 builds and runs (with a couple of warnings) but needs more testing -QTn_H = Qt6.h-t -else -# Qt 5 is currently the default version for nethack 3.7.x's Qt interface -QTn_H = Qt5.h-t -endif -$(QTn_H) :: - @if test ! -f $@; then ( rm -f $(QTany_H) *.moc qt_*.o; touch $@ ); fi; -endif #WANT_WIN_QT -endif #MAKFILE_SRC - #end of compiler.370 #------------------------------------------------------------------------------ diff --git a/sys/unix/hints/include/multiw-3.370 b/sys/unix/hints/include/multiw-3.370 new file mode 100644 index 000000000..76fcf67e9 --- /dev/null +++ b/sys/unix/hints/include/multiw-3.370 @@ -0,0 +1,44 @@ +#------------------------------------------------------------------------------ +# NetHack 3.7 multiw-3.370 $NHDT-Date: 1668359836 2022/11/13 17:17:16 $ $NHDT-Branch: NetHack-3.7 $ +# +# Further set-up for multiple window ports (interfaces) that comes after compiler.370. +# +# Included from: +# hints/linux.370 +# hints/macOS.370 +# + +# This ensures that .moc files are compatible with the version of Qt chosen. +# +ifdef MAKEFILE_SRC +ifdef WANT_WIN_QT +# when switching from Qt5 to Qt6 or vice versa, any old .moc files will be +# incompatible; get rid of them in case user hasn't run 'make spotless'; +# object files are incompatable with Qt library, so get rid of them too; +# Qt*.h-t are empty timestamp files and at most one should exist +QTany_H = Qt*.h-t +ifdef WANT_WIN_QT6 +# Qt 6 builds and runs (with a couple of warnings) but needs more testing +QTn_H = Qt6.h-t +else +# Qt 5 is currently the default version for nethack 3.7.x's Qt interface +QTn_H = Qt5.h-t +endif +$(QTn_H) :: + @if test ! -f $@; then ( rm -f $(QTany_H) *.moc qt_*.o; touch $@ ); fi; +endif #WANT_WIN_QT +endif #MAKFILE_SRC + +ifdef WANT_WIN_TTY +USE_CURSESLIB=1 +endif + +ifdef WANT_WIN_CURSES +ifneq "$(USE_CURSESLIB)" "1" +USE_CURSESLIB=1 +endif +endif + +#end of hints/include/multiw-3.370 +#------------------------------------------------------------------------------ + diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370 index ac5ef89fb..5321f6c81 100755 --- a/sys/unix/hints/linux.370 +++ b/sys/unix/hints/linux.370 @@ -1,4 +1,4 @@ -# NetHack 3.7 linux.370 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $ +# NetHack 3.7 linux.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.50 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007. # NetHack may be freely redistributed. See license for details. # @@ -86,15 +86,9 @@ endif #-INCLUDE compiler.370 -ifdef WANT_WIN_TTY -USE_CURSESLIB=1 -endif +# multiw-3.370 must come after compiler.370 -ifdef WANT_WIN_CURSES -ifneq "$(USE_CURSESLIB)" "1" -USE_CURSESLIB=1 -endif -endif +#-INCLUDE multiw-3.370 ifeq "$(USE_CURSESLIB)" "1" # default diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370 index 0bac622c6..713435f8a 100755 --- a/sys/unix/hints/macOS.370 +++ b/sys/unix/hints/macOS.370 @@ -1,4 +1,4 @@ -# NetHack 3.7 macOS.370 $NHDT-Date: 1633401749 2021/10/05 02:42:29 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.88 $ +# NetHack 3.7 macOS.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.116 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. # NetHack may be freely redistributed. See license for details. # @@ -105,15 +105,9 @@ endif #-INCLUDE compiler.370 -ifdef WANT_WIN_TTY -USE_CURSESLIB=1 -endif +# multiw-3.370 must come after compiler.370 -ifdef WANT_WIN_CURSES -ifneq "$(USE_CURSESLIB)" "1" -USE_CURSESLIB=1 -endif -endif +#-INCLUDE multiw-3.370 # NetHack sources control NHCFLAGS+=-DDLB