cross-compiler build fixes

This commit is contained in:
nhmall
2026-05-02 14:10:04 -04:00
parent 16ff591153
commit 77040f70c7
2 changed files with 11 additions and 11 deletions
+10 -10
View File
@@ -90,8 +90,8 @@ else
fi; )
endif
-touch $(TARGETPFX)pkg/RECORD
cd $(TARGETPFX)pkg ; zip -9 ../NH370DOS.ZIP * ; cd ../../..
@echo msdos package zip file $(TARGETPFX)NH370DOS.ZIP
cd $(TARGETPFX)pkg ; zip -9 ../NH500DOS.ZIP * ; cd ../../..
@echo msdos package zip file $(TARGETPFX)NH500DOS.ZIP
$(LUABIN):
( cd .. && make luabin && cd src)
@@ -105,14 +105,14 @@ deploy-to-dosbox:
endif
.PHONY: deploytodosbox
deploytodosbox: $(TARGETPFX)NH370DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \
deploytodosbox: $(TARGETPFX)NH500DOS.ZIP $(dosboxnhfolder) $(dosboxnhsrc) \
$(dosboxnhsrc)/src $(dosboxnhsrc)/include \
$(dosboxnhsrc)/sys/msdos $(dosboxnhsrc)/sys/share \
$(dosboxnhsrc)/win/share $(dosboxnhsrc)/win/curses \
$(dosboxnhsrc)/win/tty $(dosboxnhsrc)/util \
$(dosboxnhfolder)/NETHACK.EXE
@echo DOS NetHack deployed to dosbox at $(dosboxnhfolder)
$(TARGETPFX)NH370DOS.ZIP: dospkg
$(TARGETPFX)NH500DOS.ZIP: dospkg
$(dosboxnhfolder):
mkdir -p $@
$(dosboxnhsrc): $(dosboxnhfolder)
@@ -144,8 +144,8 @@ $(dosboxnhsrc)/util: $(dosboxnhsrc)
mkdir -p $@
cp --preserve=timestamps $(FLDR)util/*.c $(dosboxnhsrc)/util
cp --preserve=timestamps $(FLDR)util/*.h $(dosboxnhsrc)/util
$(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH370DOS.ZIP
unzip -o $(TARGETPFX)NH370DOS.ZIP -d $(dosboxnhfolder)
$(dosboxnhfolder)/NETHACK.EXE: $(TARGETPFX)NH500DOS.ZIP
unzip -o $(TARGETPFX)NH500DOS.ZIP -d $(dosboxnhfolder)
find $(dosboxnhfolder) -type f -name "$(dosboxconfigfile)" \
| xargs sed -i 's/#OPTIONS=video:autodetect/OPTIONS=video:autodetect/g'
endif # dosbox
@@ -225,8 +225,8 @@ mipspkg: dodata $(GAMEBIN) $(TARGETPFX)recover
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt
-touch $(TARGETPFX)pkg/record
cd $(TARGETPFX)pkg ; zip -9 ../nh370mips.zip * ; cd ../../..
@echo MIPS package zip file $(TARGETPFX)nh370mips.zip
cd $(TARGETPFX)pkg ; zip -9 ../nh500mips.zip * ; cd ../../..
@echo MIPS package zip file $(TARGETPFX)nh500mips.zip
endif # CROSS_TO_MIPS
@@ -332,8 +332,8 @@ amigapkg: $(AMITILES) ../util/uudecode
-( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/HackWB.uu && \
../../../util/uudecode ../../../sys/amiga/HackWB.uu )
touch $(TARGETPFX)pkg/record
( cd $(TARGETPFX)pkg && zip -9r ../NH370AMI.ZIP * )
@echo amiga package zip file $(TARGETPFX)NH370AMI.ZIP
( cd $(TARGETPFX)pkg && zip -9r ../NH500AMI.ZIP * )
@echo amiga package zip file $(TARGETPFX)NH500AMI.ZIP
endif # CROSS_TO_AMIGA
ifdef CROSS_SHARED
+1 -1
View File
@@ -146,7 +146,7 @@ ifdef DOSBOX
dosbox=$(DOSBOX)
endif
ifdef dosbox
dosboxgameid=NH370
dosboxgameid=NH500
dosboxtop=$(dosbox)
dosboxnhfolder=$(dosboxtop)/$(dosboxgameid)
dosboxnhsrc=$(dosboxnhfolder)/NHSRC