Various random mostly-header cleanup bits. No functional changes. · NetHack/NetHack@3cf65c4 · GitHub
Skip to content

Commit 3cf65c4

Browse files
nhkeninhkeni
committed
Various random mostly-header cleanup bits. No functional changes.
1 parent a9f93bb commit 3cf65c4

17 files changed

Lines changed: 69 additions & 70 deletions

‎dat/bigrm-12.lua‎

Lines changed: 1 addition & 1 deletion

‎dat/luahelper‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# NetHack 5.0 luahelper $NHDT-Date: 1777237994 2026/04/26 16:13:14 $ $NHDT-Branch: NetHack-5.0 $
1+
# NetHack 5.0 luahelper $NHDT-Date: 1791235988 2026/10/05 21:33:08 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.7 $
22
#
33
# Makefile to assist developers in adding lines to various build
44
# Makefiles, or project files, as lua files are added or removed.

‎sys/unix/Makefile.check‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# NetHack 5.0 Makefile.check $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-5.0
1+
# NetHack 5.0 Makefile.check $NHDT-Date: 1791236407 2026/10/05 21:40:07 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.5 $
22

33
SUPATH := sys/unix/
44
MKHINTSPATH := $(SUPATH)hints/

‎sys/unix/hints/include/compiler.501‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#------------------------------------------------------------------------------
2-
# NetHack 5.0 compiler $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-5.0 $
1+
#==============================================================================
2+
# NetHack 5.0 compiler $NHDT-Date: 1791245094 2026/10/06 00:04:54 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.57 $
33

44
# compiler flags: CCFLAGS is used to construct a value for CFLAGS with
55
# various -I, -D, and -W settings appended below;
@@ -284,4 +284,4 @@ CSTD = -std=$(HAVECSTD)
284284
endif
285285

286286
#end of compiler
287-
#------------------------------------------------------------------------------
287+
#==============================================================================

‎sys/unix/hints/include/cross-post.501‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#===============-=================================================
2-
# NetHack 5.0 include/cross-post $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-5.0 $
1+
#=================================================================
2+
# NetHack 5.0 include/cross-post $NHDT-Date: 1791245095 2026/10/06 00:04:55 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.100 $
33
#
44
# Cross-compiling -POST section
55

@@ -575,7 +575,7 @@ $(GAMEBIN) : $(HOBJ) $(DATE_O) $(TARGET_HACKLIB) $(LUACROSSLIB)
575575
$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
576576
$(HOBJ) $(DATE_O) $(TARGET_HACKLIB) $(LUACROSSLIB) $(WINLIB) $(TARGET_LIBS)
577577

578-
# --- PPC UI resource compiles (mirror of the 68k rules) ---
578+
# === PPC UI resource compiles (mirror of the 68k rules) ===
579579
$(TARGETPFX)nhvers.rsrc : ../sys/mac68k/nhvers.r
580580
@mkdir -p $(dir $@)
581581
$(RETRO68)/bin/Rez ../sys/mac68k/nhvers.r -I $(RETRO68)/multiversal/RIncludes -o $@
@@ -591,7 +591,7 @@ $(TARGETPFX)nhmenus.rsrc : ../sys/mac68k/nhmenus.r ../sys/mac68k/nhtitle.r
591591
$(TARGETPFX)nhcfrg.rsrc : ../sys/mac68k/nhcfrg.r
592592
@mkdir -p $(dir $@)
593593
$(RETRO68)/bin/Rez ../sys/mac68k/nhcfrg.r -I $(RETRO68)/multiversal/RIncludes -o $@
594-
# --- Recover helper (PPC): link XCOFF; MakePEF happens in the pkg recipe ---
594+
# === Recover helper (PPC): link XCOFF; MakePEF happens in the pkg recipe ===
595595
$(TARGETPFX)mrecover.o: ../sys/mac68k/mrecover.c
596596
$(TARGET_CC) $(TARGET_CFLAGS) -o $@ ../sys/mac68k/mrecover.c
597597
$(TARGETPFX)Recover.xcoff: $(TARGETPFX)mrecover.o
@@ -683,7 +683,7 @@ macppcpkg: $(GAMEBIN) $(TARGETPFX)Recover.xcoff \
683683
@test -f $(TARGETPFX)NetHack.sit && \
684684
echo "StuffIt: $(TARGETPFX)NetHack.sit" || true
685685

686-
# --- Fat (68k + PowerPC) binary -----------------------------------------
686+
# === Fat (68k + PowerPC) binary =========================================
687687
# One app whose resource fork holds the 68k CODE/DATA/RELA + a cfrg + the
688688
# shared UI resources, and whose data fork holds the PPC PEF. 68k Macs run
689689
# the CODE resources; PowerPC Macs see the cfrg and run the PEF natively.
@@ -1000,4 +1000,4 @@ $(TARGETPFX)pdcutil.o : $(PDCPORT)/pdcutil.c
10001000
endif # BUILD_PDCURSES
10011001
#
10021002
# End of cross-compiling -POST section
1003-
#===============-=================================================
1003+
#=================================================================

‎sys/unix/hints/include/cross-pre1.501‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#===============-=================================================
2-
# NetHack 5.0 include/cross-pre1. $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-5.0 $
1+
#=================================================================
2+
# NetHack 5.0 include/cross-pre1. $NHDT-Date: 1791245095 2026/10/06 00:04:55 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.11 $
33
#
44
# Cross-compiling -PRE section 1
55
#
@@ -87,5 +87,5 @@ override CLEANMORE=
8787
override PACKAGE=
8888
endif
8989
# End of cross-compiling -PRE section 1
90-
#===============-=================================================
90+
#=================================================================
9191

‎sys/unix/hints/include/cross-pre2.501‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#===============-=================================================
2-
# NetHack 5.0 include/cross-pre2 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-5.0 $
1+
#=================================================================
2+
# NetHack 5.0 include/cross-pre2 $NHDT-Date: 1791245095 2026/10/06 00:04:55 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.120 $
33
#
44
# Cross-compiling -PRE section 2
55
#
66

77
ifdef BUILD_TARGET_LUA
8-
#===============-=================================================
8+
#=================================================================
99
# LUA library
1010
#=================================================================
1111
LUATOP ?= nhlua/lua/src
@@ -37,9 +37,9 @@ LUAINCL=
3737
endif # BUILD_TARGET_LUA
3838

3939
ifdef BUILD_PDCURSES
40-
#===============-=================================================
40+
#=================================================================
4141
# PD Curses library
42-
#===============-=================================================
42+
#=================================================================
4343
ifdef WANT_WIN_CURSES
4444
PDCTOP = ../lib/pdcursesmod
4545
ifdef WANT_DOSVGA
@@ -300,10 +300,10 @@ endif # CROSS_TO_MSDOS
300300

301301

302302
ifdef CROSS_TO_WASM
303-
#===============-=================================================
303+
#=================================================================
304304
# WASM
305305
# originally from https://github.com/NetHack/NetHack/pull/385
306-
#===============-=================================================
306+
#=================================================================
307307
#also set a make variable flagging this as a crosscompile
308308
#
309309
#WASM_DEBUG = 1
@@ -502,9 +502,9 @@ endif # CROSS_TO_MIPS
502502
#=================================================================
503503

504504
ifdef CROSS_TO_AMIGA
505-
#===============-=================================================
505+
#=================================================================
506506
# AmigaOS m68k cross-compile recipe
507-
#===============-=================================================
507+
#=================================================================
508508
# Uses an Amiga M68K cross-compiler on linux or macOS.
509509
#
510510
# Cross-compiler: https://franke.ms/git/bebbo/amiga-gcc
@@ -758,9 +758,9 @@ override CLEANMORE += rm -rf $(TARGETDIR) ;
758758
endif # CROSS_TO_MACPPC
759759

760760
ifdef CROSS_TO_ATARI
761-
#===============-=================================================
761+
#=================================================================
762762
# Atari ST/TT/Falcon cross-compile recipe
763-
#===============-=================================================
763+
#=================================================================
764764
# Uses the m68k-atari-mint cross-compiler on Linux or macOS.
765765
#
766766
# Toolchain: https://tho-otto.de/crossmint.php
@@ -1011,9 +1011,9 @@ override CLEANMORE += rm -rf $(TARGETDIR) ;
10111011
endif # CROSS_TO_MACPPC
10121012

10131013
ifdef CROSS_TO_ATARI
1014-
#===============-=================================================
1014+
#=================================================================
10151015
# Atari ST/TT/Falcon cross-compile recipe
1016-
#===============-=================================================
1016+
#=================================================================
10171017
# Uses the m68k-atari-mint cross-compiler on Linux or macOS.
10181018
#
10191019
# Toolchain: https://tho-otto.de/crossmint.php
@@ -1120,5 +1120,5 @@ $(TARGETPFX)%.o : $(LUASRCDIR)/%.c
11201120
endif # BUILD_TARGET_LUA
11211121
#
11221122
# End of cross-compiling -PRE section
1123-
#===============-=================================================
1123+
#=================================================================
11241124

‎sys/unix/hints/include/dirs-perms.501‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#------------------------------------------------------------------------------
2-
# NetHack 5.0 directories $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-5.0 $
1+
#==============================================================================
2+
# NetHack 5.0 directories $NHDT-Date: 1791245095 2026/10/06 00:04:55 $ $NHDT-Branch: keni-headercleanup $ $NHDT-Revision: 1.1 $
33

44
ifndef WANT_SHARED_INSTALL
55
PREFIX=$(abspath $(NHSROOT))
66
SOURCEINSTALL=1
77

8-
# -----------------------------------------
8+
# =========================================
99
# This is for the Linux source tree install
10-
# -----------------------------------------
10+
# =========================================
1111
ifeq "$(WHICH_OS)" "Linux"
1212

1313
HACKDIR ?=$(PREFIX)/playground
@@ -20,9 +20,9 @@ VARDIRPERM ?= 0700
2020

2121
else # macOS
2222
#
23-
# -----------------------------------------
23+
# =========================================
2424
# This is for the macOS source tree install
25-
# -----------------------------------------
25+
# =========================================
2626
#
2727
# The macOS setup sets things up two different
2828
# ways, depending on whether an explicit
@@ -57,9 +57,9 @@ endif # not WANT_SHARED_INSTALL
5757
ifneq "$(SOURCEINSTALL)" "1"
5858
ifdef WANT_SHARED_INSTALL
5959
ifeq "$(WHICH_OS)" "Linux"
60-
# -----------------------------------------
60+
# =========================================
6161
# This is for the Linux system-wide install
62-
# -----------------------------------------
62+
# =========================================
6363

6464
PREFIX ?=$(wildcard ~)/nh/install
6565
HACKDIR ?=$(PREFIX)/games/lib/nethackdir
@@ -72,14 +72,14 @@ VARDIRPERM ?= 0755
7272
VARFILEPERM ?= 0600
7373
GAMEPERM ?= 0755
7474

75-
# ----------------------------------
75+
# ==================================
7676
# End of Linux system-wide install
77-
# ----------------------------------
77+
# ==================================
7878

7979
else # macOS
80-
# ------------------------------------------------
80+
# ================================================
8181
# This is for the macOS system-wide shared install
82-
# ------------------------------------------------
82+
# ================================================
8383

8484
# if $GAMEUID is root, we install into roughly
8585
# proper Mac locations, otherwise we install
@@ -111,13 +111,13 @@ VARDIR ?=$(HACKDIR)
111111
VARFILEPERM ?= 0664
112112
VARDIRPERM ?= 0775
113113

114-
# ---------------------------------------
114+
# =======================================
115115
# End of macOS system-wide shared install
116-
# --------------------------------------
116+
# ======================================
117117
endif # WHICH_OS?
118118
endif # WANT_SHARED_INSTALL
119119
endif # SOURCEINSTALL != 1
120120

121121
#end of dirs-perms
122-
#--------------------------------------
122+
#======================================
123123

‎sys/unix/hints/include/linuxdistro.501‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ----- linuxdistro --------
1+
# ===== linuxdistro ========
22

33
LINUX_DISTRO=
44
OS_ID := $(shell grep -E '^ID=' /etc/os-release 2>/dev/null | cut -d= -f2)
@@ -22,4 +22,4 @@ LINUX_DISTRO=fedora
2222
USE_SYSTEM_LUA=1
2323
endif
2424
#$(info LINUX_DIST=$(LINUX_DISTRO))
25-
# ----- end of linuxdistro --------
25+
# ===== end of linuxdistro ========

‎sys/unix/hints/include/misc.501‎

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)