nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

less prone to overlooking target names next time

Browse Source
This commit is contained in:
nhmall
2026-05-02 22:05:31 -04:00
parent a417ca49a2
commit c2a7bdb369
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/README-hints
+2 -2
View File
@@ -5,7 +5,7 @@ The sys/unix/hints/include subfolder contains Makefile content that
is included in the distributed Makefiles. is included in the distributed Makefiles.
[.370 hints] [.500 hints]
There are two .500 series hints files provided with NetHack: There are two .500 series hints files provided with NetHack:
@@ -16,7 +16,7 @@ Those will also pull in content from sys/unix/hints/include/*.370,
that is shared between the linux.500 and macOS.500 hints files. that is shared between the linux.500 and macOS.500 hints files.
[.370 make build options] [.500 make build options]
Here are some options that can be specified on the make command Here are some options that can be specified on the make command
sys/unix/hints/include/cross-post.500
+10 -10
View File
@@ -90,8 +90,8 @@ else
fi; ) fi; )
endif endif
-touch $(TARGETPFX)pkg/RECORD -touch $(TARGETPFX)pkg/RECORD
cd $(TARGETPFX)pkg ; zip -9 ../NH500DOS.ZIP * ; cd ../../.. cd $(TARGETPFX)pkg ; zip -9 ../NH$(NHV)DOS.ZIP * ; cd ../../..
@echo msdos package zip file $(TARGETPFX)NH500DOS.ZIP @echo msdos package zip file $(TARGETPFX)NH$(NHV)DOS.ZIP
$(LUABIN): $(LUABIN):
( cd .. && make luabin && cd src) ( cd .. && make luabin && cd src)
@@ -105,14 +105,14 @@ deploy-to-dosbox:
endif endif
.PHONY: deploytodosbox .PHONY: deploytodosbox
deploytodosbox: $(TARGETPFX)NH500DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \ deploytodosbox: $(TARGETPFX)NH$(NHV)DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \
$(dosboxnhsrc)/src $(dosboxnhsrc)/include \ $(dosboxnhsrc)/src $(dosboxnhsrc)/include \
$(dosboxnhsrc)/sys/msdos $(dosboxnhsrc)/sys/share \ $(dosboxnhsrc)/sys/msdos $(dosboxnhsrc)/sys/share \
$(dosboxnhsrc)/win/share $(dosboxnhsrc)/win/curses \ $(dosboxnhsrc)/win/share $(dosboxnhsrc)/win/curses \
$(dosboxnhsrc)/win/tty $(dosboxnhsrc)/util \ $(dosboxnhsrc)/win/tty $(dosboxnhsrc)/util \
$(dosboxnhfolder)/NETHACK.EXE $(dosboxnhfolder)/NETHACK.EXE
@echo DOS NetHack deployed to dosbox at $(dosboxnhfolder) @echo DOS NetHack deployed to dosbox at $(dosboxnhfolder)
$(TARGETPFX)NH500DOS.ZIP: dospkg $(TARGETPFX)NH$(NHV)DOS.ZIP: dospkg
$(dosboxnhfolder): $(dosboxnhfolder):
mkdir -p $@ mkdir -p $@
$(dosboxnhsrc): $(dosboxnhfolder) $(dosboxnhsrc): $(dosboxnhfolder)
@@ -144,8 +144,8 @@ $(dosboxnhsrc)/util: $(dosboxnhsrc)
mkdir -p $@ mkdir -p $@
cp --preserve=timestamps $(FLDR)util/*.c $(dosboxnhsrc)/util cp --preserve=timestamps $(FLDR)util/*.c $(dosboxnhsrc)/util
cp --preserve=timestamps $(FLDR)util/*.h $(dosboxnhsrc)/util cp --preserve=timestamps $(FLDR)util/*.h $(dosboxnhsrc)/util
$(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH500DOS.ZIP $(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH$(NHV)DOS.ZIP
unzip -o $(TARGETPFX)NH500DOS.ZIP -d $(dosboxnhfolder) unzip -o $(TARGETPFX)NH$(NHV)DOS.ZIP -d $(dosboxnhfolder)
find $(dosboxnhfolder) -type f -name "$(dosboxconfigfile)" \ find $(dosboxnhfolder) -type f -name "$(dosboxconfigfile)" \
| xargs sed -i 's/#OPTIONS=video:autodetect/OPTIONS=video:autodetect/g' | xargs sed -i 's/#OPTIONS=video:autodetect/OPTIONS=video:autodetect/g'
endif # dosbox endif # dosbox
@@ -225,8 +225,8 @@ mipspkg: dodata $(GAMEBIN) $(TARGETPFX)recover
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt
-touch $(TARGETPFX)pkg/record -touch $(TARGETPFX)pkg/record
cd $(TARGETPFX)pkg ; zip -9 ../nh500mips.zip * ; cd ../../.. cd $(TARGETPFX)pkg ; zip -9 ../nh$(NHV)mips.zip * ; cd ../../..
@echo MIPS package zip file $(TARGETPFX)nh500mips.zip @echo MIPS package zip file $(TARGETPFX)nh$(NHV)mips.zip
endif # CROSS_TO_MIPS endif # CROSS_TO_MIPS
@@ -332,8 +332,8 @@ amigapkg: $(AMITILES) ../util/uudecode
-( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/HackWB.uu && \ -( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/HackWB.uu && \
../../../util/uudecode ../../../sys/amiga/HackWB.uu ) ../../../util/uudecode ../../../sys/amiga/HackWB.uu )
touch $(TARGETPFX)pkg/record touch $(TARGETPFX)pkg/record
( cd $(TARGETPFX)pkg && zip -9r ../NH500AMI.ZIP * ) ( cd $(TARGETPFX)pkg && zip -9r ../NH$(NHV)AMI.ZIP * )
@echo amiga package zip file $(TARGETPFX)NH500AMI.ZIP @echo amiga package zip file $(TARGETPFX)NH$(NHV)AMI.ZIP
endif # CROSS_TO_AMIGA endif # CROSS_TO_AMIGA
ifdef CROSS_SHARED ifdef CROSS_SHARED
sys/unix/hints/include/cross-pre2.500
+1 -1
View File
@@ -146,7 +146,7 @@ ifdef DOSBOX
dosbox=$(DOSBOX) dosbox=$(DOSBOX)
endif endif
ifdef dosbox ifdef dosbox
dosboxgameid=NH500 dosboxgameid=NH$(NHV)
dosboxtop=$(dosbox) dosboxtop=$(dosbox)
dosboxnhfolder=$(dosboxtop)/$(dosboxgameid) dosboxnhfolder=$(dosboxtop)/$(dosboxgameid)
dosboxnhsrc=$(dosboxnhfolder)/NHSRC dosboxnhsrc=$(dosboxnhfolder)/NHSRC
sys/unix/hints/include/multiw-1.500
+4
View File
@@ -19,5 +19,9 @@
#WANT_DEFAULT=Qt #WANT_DEFAULT=Qt
#WANT_DEFAULT=X11 #WANT_DEFAULT=X11
# Based on the NetHack version 5.0.0
# Used to build some filenames subsequently in other include files
NHV=500
#end of multiw-1.500 #end of multiw-1.500
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
sys/windows/GNUmakefile
+1 -2
View File
@@ -1388,9 +1388,8 @@ TARGET_CPU = x86
endif endif
endif endif
NHV=370
PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \ PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \
NetHackW.exe opthelp nhdat370 record symbols sysconf.template $(notdir $(LUADLL)) NetHackW.exe opthelp nhdat$(NHV) record symbols sysconf.template $(notdir $(LUADLL))
FILESTOZIP = $(addprefix $(GAMEDIR)/, $(PKGFILES)) FILESTOZIP = $(addprefix $(GAMEDIR)/, $(PKGFILES))
MAINZIP = $(PkgDir)/nethack-$(NHV)-win-$(TARGET_CPU)-msys2.zip MAINZIP = $(PkgDir)/nethack-$(NHV)-win-$(TARGET_CPU)-msys2.zip
sys/windows/Makefile.nmake
+2 -2
View File
@@ -2785,11 +2785,11 @@ $(SndWavDir)sa2_xplevelup.wav: $(SndWavDir)sa2_xplevelup.uu $(U)uudecode.exe
#=============================================================================== #===============================================================================
PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \ PKGFILES = nethackrc.template Guidebook.txt license NetHack.exe NetHack.txt \
NetHackW.exe opthelp nhdat500 record symbols \ NetHackW.exe opthelp nhdat$(NHV) record symbols \
sysconf.template $(SFCTOOLBASENAM) sysconf.template $(SFCTOOLBASENAM)
FILESTOZIP = $(BinDir)nethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \ FILESTOZIP = $(BinDir)nethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \
$(BinDir)NetHack.exe $(BinDir)NetHack.txt $(BinDir)NetHackW.exe \ $(BinDir)NetHack.exe $(BinDir)NetHack.txt $(BinDir)NetHackW.exe \
$(BinDir)opthelp $(BinDir)nhdat500 $(BinDir)record \ $(BinDir)opthelp $(BinDir)nhdat$(NHV) $(BinDir)record \
$(BinDir)symbols $(BinDir)sysconf.template $(SFCTOOLPKG) $(BinDir)symbols $(BinDir)sysconf.template $(SFCTOOLPKG)
DBGSYMS = NetHack.PDB NetHackW.PDB $(SFCTOOLPDBNAM) DBGSYMS = NetHack.PDB NetHackW.PDB $(SFCTOOLPDBNAM)