bug fixes

This commit is contained in:
nhkeni
2024-03-10 15:46:20 -04:00
parent c747f2af9c
commit ae82f6494e
2 changed files with 8 additions and 5 deletions

View File

@@ -837,6 +837,7 @@ updatedepend-setup:
if [ $$p = $${p%/sys/unix} ]; then \ if [ $$p = $${p%/sys/unix} ]; then \
echo "updatedepend must be run in sys/unix"; exit 1; \ echo "updatedepend must be run in sys/unix"; exit 1; \
fi fi
touch $(HACK_H)
@ # generate bogus files @ # generate bogus files
echo "Generating bogus include/nhlua.h" echo "Generating bogus include/nhlua.h"
(HFILE=../../include/nhlua.h && \ (HFILE=../../include/nhlua.h && \
@@ -851,9 +852,9 @@ updatedepend-setup:
@echo "#include \"hack.h\"" >> ../../src/tile.c @echo "#include \"hack.h\"" >> ../../src/tile.c
MAKEFILE_NAME=Makefile MAKEFILE_NAME=Makefile
depend: ../sys/unix/depend.awk \ depend: ../sys/unix/depend.awk \
$(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \
$(CHAINSRC) $(GENCSRC) $(HACKCSRC) $(CHAINSRC) $(GENCSRC) $(HACKCSRC)
$(AWK) -f ../sys/unix/depend.awk ../include/*.h ../win/*/*.h \ $(AWK) -f ../sys/unix/depend.awk ../include/*.h ../win/*/*.h \
$(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \
$(CHAINSRC) $(GENCSRC) $(HACKCSRC) >makedep $(CHAINSRC) $(GENCSRC) $(HACKCSRC) >makedep
@@ -869,6 +870,7 @@ depend: ../sys/unix/depend.awk \
- diff Makefile.bak $(MAKEFILE_NAME) - diff Makefile.bak $(MAKEFILE_NAME)
@rm -f Makefile.bak @rm -f Makefile.bak
@rm -f ../include/nhlua.h tile.c @rm -f ../include/nhlua.h tile.c
@rm -f $(HACK_H)
# DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT # DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT
@@ -1270,6 +1272,7 @@ $(TARGETPFX)wizcmds.o: wizcmds.c $(HACK_H) ../include/func_tab.h
$(TARGETPFX)worm.o: worm.c $(HACK_H) $(TARGETPFX)worm.o: worm.c $(HACK_H)
$(TARGETPFX)worn.o: worn.c $(HACK_H) $(TARGETPFX)worn.o: worn.c $(HACK_H)
$(TARGETPFX)write.o: write.c $(HACK_H) $(TARGETPFX)write.o: write.c $(HACK_H)
$(TARGETPFX)zap.o: zap.c $(HACK_H)
qt_kde0.moc: $(QTn_H) ../win/Qt/qt_kde0.h qt_kde0.moc: $(QTn_H) ../win/Qt/qt_kde0.h
$(MOCPATH) -o $@ $(QTn_H) $(MOCPATH) -o $@ $(QTn_H)
qt_main.moc: $(QTn_H) ../win/Qt/qt_kde0.h ../win/Qt/qt_main.h qt_main.moc: $(QTn_H) ../win/Qt/qt_kde0.h ../win/Qt/qt_main.h

View File

@@ -101,8 +101,8 @@ function output_dep(){
function output_final( x) function output_final( x)
{ {
if(dorulesort){ if(dorulesort){
nhsort(worklist, 1, worklistctr-1, 1) nhsort(worklist, 1, worklistctr, 1)
for(x=1;x<worklistctr;x++){ for(x=1;x<=worklistctr;x++){
file = worklist[x] file = worklist[x]
output_final2() output_final2()
} }