Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

2024-03-20 11:56:32 -04:00
parent 41bdaa348a e3ec21c5d3
commit 4786f82e73
152 changed files with 4625 additions and 4270 deletions
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -446,7 +446,7 @@ endif
 #==========================================
 #
 ifeq "$(ADD_CURSES)" "Y"
-CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE"
+CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE" -DPDC_RGB
 ifdef WANT_DOSVGA
 CURSESDEF += -DCURSES_UNICODE -DPDC_WIDE
 endif
@@ -538,13 +538,13 @@ $(OBJ)/%.o : $(WCURSES)/%.c
 #==========================================

 $(OBJ)/%.o : $(PDCURSES_TOP)/%.c
-	$(CC) $(cflags)  -o$@  $<
+	$(CC) $(cflags) -o$@  $<

 $(OBJ)/%.o : $(PDCSRC)/%.c
-	$(CC) $(cflags)  -o$@  $<
+	$(CC) $(cflags) -o$@  $<

 $(OBJ)/%.o : $(PDCDOS)/%.c
-	$(CC) $(cflags)  -o$@  $<
+	$(CC) $(cflags) -o$@  $<

 #==========================================
 # Rules for LUA files
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -447,30 +447,9 @@ QUIETCC=0

 # NB: This is not used for all .c files (see explicit rules in
 #  dependencies).
-# if NOSTATICCORE
 #    A normal or cross compile.
-# else
-#    NOSTATICCORE: A compile that makes all functions non-static.
-#    Rule /=/ allows 2 definitions of char array brief_feeling
-# fi
 $(TARGETPFX)%.o : %.c
-	@if [ x$(NOSTATICCORE) = 'x' ]; then \
-	    echo $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ $< ; \
-	    $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ $< ; \
-	else \
-	    ( \
-	    echo "Generating " intermediate file .$< ; \
-		$(AWK) ' \
-			BEGIN{print "#line 1 \"$<\""}; \
-			/=/{print;next}; \
-			sub(/^static inline/, ""){print;next}; \
-			sub(/^static( |$$)/, ""){print;next}; \
-			{print}; \
-		' < $< > .$< && \
-		echo $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ .$< ; \
-		$(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ .$< ; \
-	    ) \
-	fi
+	$(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ $<

 # Verbosity definitions, begin
 #   Set QUIETCC=1 above to output less feedback while building.
@@ -1171,8 +1150,8 @@ $(TARGETPFX)engrave.o: engrave.c $(HACK_H)
 $(TARGETPFX)exper.o: exper.c $(HACK_H)
 $(TARGETPFX)explode.o: explode.c $(HACK_H)
 $(TARGETPFX)extralev.o: extralev.c $(HACK_H)
-$(TARGETPFX)files.o: files.c #zlib.h $(HACK_H) ../include/dlb.h \
-		../include/wintty.h
+$(TARGETPFX)files.o: files.c $(HACK_H) ../include/dlb.h ../include/wintty.h \
+		#zlib.h
 $(TARGETPFX)fountain.o: fountain.c $(HACK_H)
 $(TARGETPFX)getpos.o: getpos.c $(HACK_H)
 $(TARGETPFX)hack.o: hack.c $(HACK_H)
--- a/sys/unix/depend.awk
+++ b/sys/unix/depend.awk
@@ -11,7 +11,6 @@
 #     cd .. ; sh sys/unix/setup.sh [sys/unix/hints/FOO] )
 # newer usage:
 #   cd sys/unix ; make -f Makefile.src updatedepend
-
 #
 # This awk program scans each file in sequence, looking for lines beginning
 # with `#include "' and recording the name inside the quotes.  For .h files,
@@ -19,6 +18,10 @@
 # corresponding .o file; dependencies in nested header files are propagated
 # to the .o target.
 #
+# Variables that can be set on the command line:
+#  -v dontsortdeps=1               do not sort the dependencies
+#  -v dontsortfules=1              do not sort the rules
+#
 # config.h and hack.h get special handling because of their heavy use;
 #	timestamps for them allow make to avoid rechecking dates on
 #	subsidiary headers for every source file;
@@ -34,8 +37,6 @@
 # zlib.h ditto
 #
 BEGIN		{ FS = "\""			#for `#include "X"', $2 is X
-		  dosort = 1
-		  dorulesort = 1
 		  special[++sp_cnt] = "../include/config.h"
 		  special[++sp_cnt] = "../include/hack.h"
 		  alt_deps["../include/extern.h"] = ""
@@ -91,7 +92,7 @@ END		{
 #

 function output_dep(){
-  if(dorulesort){
+  if(!dontsortrules){
    worklist[++worklistctr] = file
  } else {
    output_final2()
@@ -100,7 +101,7 @@ function output_dep(){

 function output_final(				x)
 {
-  if(dorulesort){
+  if(!dontsortrules){
    nhsort(worklist, 1, worklistctr, 1)
    for(x=1;x<=worklistctr;x++){
      file = worklist[x]
@@ -173,7 +174,7 @@ function format_dep(target, source,		col, n, i, list, prefix, moc)
  #files duplicate the target as next element but we need to skip that too
  first = moc ? 3 : 2
  source = list[first]
-  if (dosort){
+  if (!dontsortdeps){
    nhsort(list, first, n, 0)
  }
  for (i = first; i <= n; i++) {
@@ -250,6 +251,9 @@ function nhsort(list, first, last, cmpid,		i,j,temp)
 function nhcmp(a,b,cmpid)
 {
  if(cmpid == 0){		  # sort dependencies
+      # commented out entry (there can be only one) MUST be last
+    if (a ~ /^#/){ return 1}
+    if (b ~ /^#/){ return 0}
      # 2 .c or .cpp files
    if (a ~ /\.c(pp)?$/ && b ~ /\.c(pp)?$/ ){ return a > b }
      # a .c or .cpp file and anything else
--- a/sys/unix/hints/include/cross-pre2.370
+++ b/sys/unix/hints/include/cross-pre2.370
@@ -50,7 +50,7 @@ ifdef WANT_DOSVGA
 PDCPORT = $(PDCTOP)/dosvga
 PDCURSESDEF= -I$(PDCTOP) -I$(PDCPORT) \
 		-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE" \
-		-D"PDC_WIDE" -D"CURSES_UNICODE"
+		-D"PDC_WIDE" -D"PDC_RGB" -D"CURSES_UNICODE"
 else
 PDCPORT = $(PDCTOP)/dos
 PDCURSESDEF= -I$(PDCTOP) -I$(PDCPORT) \
--- a/sys/unix/hints/linux.370
+++ b/sys/unix/hints/linux.370
@@ -45,8 +45,11 @@ GAMEGRP  = games

 # This gives better backtraces by making all core functions global; this
 # works around a limitation in glibc's backtrace(3) function.
-# Recommended with CRASHREPORT.
-#NOSTATICCORE = 1
+# This will be turned on automatically with CRASHREPROT.
+# 1 to enable, 0 to disable
+USE_NOSTATICFN = 1
+# If you want CRASHREPORT but absolutely don't want NOSTATICFN, define this:
+#USE_NONOSTATICFN = 1

 #-----------------------------------------------------------------------------
 #-INCLUDE cross-pre1.370
@@ -344,6 +347,14 @@ POSTINSTALL+= sed -i -e 's;^GDBPATH=/usr/bin/gdb;\#GDBPATH=/usr/bin/gdb;' \
 		-e 's;PANICTRACE_GDB=1;PANICTRACE_GDB=0;' $(INSTDIR)/sysconf;
 endif

+ifeq 'USENONOSTATICFN' '1'
+CFLAGS += -DNONOSTATICFN
+else
+ifeq 'USE_NOSTATICFN' '1'
+CFLAGS += -DNOSTATICFN
+endif
+endif
+
 # Lua
 # when building liblua.a, avoid warning that use of tmpnam() should be
 # replaced by mkstemp(); the lua code doesn't use nethack's config.h so
--- a/sys/windows/Makefile.mingw32
+++ b/sys/windows/Makefile.mingw32
@@ -118,7 +118,7 @@ GIT_AVAILABLE=Y
 endif

 PDCURSES=pdcursesmod
-PDCURSESFLAGS = -DPDC_WIDE
+PDCURSESFLAGS = -DPDC_WIDE -DPDC_RGB

 #
 #==============================================================================
--- a/sys/windows/Makefile.nmake
+++ b/sys/windows/Makefile.nmake
@@ -602,7 +602,7 @@ WINDHDR = $(MSWSYS)\win10.h $(MSWSYS)\winos.h $(MSWSYS)\win32api.h
 #

 !IF "$(ADD_CURSES)" == "Y"
-PDCURSESFLAGS = -DPDC_WIDE
+PDCURSESFLAGS = -DPDC_WIDE -DPDC_RGB
 CURSESOBJ= $(OTTY)cursdial.o $(OTTY)cursinit.o $(OTTY)cursinvt.o \
 	$(OTTY)cursmain.o $(OTTY)cursmesg.o $(OTTY)cursmisc.o \
 	$(OTTY)cursstat.o $(OTTY)curswins.o
--- a/sys/windows/vs/PDCurses/PDCurses.vcxproj
+++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj
@@ -90,14 +90,14 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -105,7 +105,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -117,7 +117,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
+++ b/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
@@ -84,14 +84,14 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PDC_WIDE;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;PDC_WIDE;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -99,7 +99,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;PDC_WIDE;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -111,7 +111,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;PDC_WIDE;PDC_RGB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>