Windows mingw Makefile updates

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index ef7f9ca0b3d9d880babb548e6f40955738df2524..58cf34eb6e9b0747fc47b4b353de9c1cb48a3251 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -752,9 +752,6 @@ install: $(INCL)/nhlua.h initialchk $(O)utility.tag $(GAMEDIR)/NetHack.exe $(NET
        @echo Done.
 
 $(O)install.tag:  $(DAT)/data    $(DAT)/rumors $(DAT)/oracles \
-ifndef LUA_QTEXT_FILE
-               $(DAT)/quest.dat \
-endif
                $(O)sp_lev.tag $(DLB)
 ifdef TRAVIS_COMPILER
        ls -l $(SRC)
@@ -798,8 +795,7 @@ $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
 $(INCL)/nhlua.h:
        echo '/* nhlua.h - generated by top Makefile */' > $@
        @echo '#include "../lib/lua-$(LUA_VERSION)/src/lua.h"' >> $@
-       @sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \
-               < lib/lua-$(LUA_VERSION)/src/lua.h >> $@
+       @echo 'LUA_API int (lua_error) (lua_State *L) NORETURN;' >>$@
        @echo '#include "../lib/lua-$(LUA_VERSION)/src/lualib.h"' >> $@
        @echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@
        @echo '/*nhlua.h*/' >> $@
@@ -934,11 +930,6 @@ $(DAT)/data: $(O)utility.tag    $(DATABASE)
 $(DAT)/rumors: $(O)utility.tag    $(DAT)/rumors.tru   $(DAT)/rumors.fal
        $(subst /,\,$(U)makedefs -r)
 
-ifndef LUA_QTEXT_FILE
-$(DAT)/quest.dat: $(O)utility.tag  $(DAT)/quest.txt
-       $(subst /,\,$(U)makedefs -q)
-endif
-
 $(DAT)/oracles: $(O)utility.tag    $(DAT)/oracles.txt
        $(subst /,\,$(U)makedefs -h)
 
@@ -1044,9 +1035,6 @@ $(DAT)/porthelp: $(MSWSYS)/porthelp
        $(subst /,\,@copy $(MSWSYS)/porthelp $@ >nul)
 
 nhdat$(NHV):  $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
-ifndef LUA_QTEXT_FILE
-       $(DAT)/quest.dat \
-endif
        $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp $(DAT)/keyhelp \
        $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp \
        $(DAT)/porthelp $(DAT)/license $(DAT)/engrave \
@@ -1057,9 +1045,6 @@ endif
        $(subst /,\,if exist $(DAT)/ttyoptions echo ttyoptions >>$(DAT)/dlb.lst)
        $(subst /,\,if exist $(DAT)/guioptions echo guioptions >>$(DAT)/dlb.lst)
        $(subst /,\,if exist $(DAT)/porthelp echo porthelp >>$(DAT)/dlb.lst)
-ifndef LUA_QTEXT_FILE
-       $(subst /,\,echo quest.dat >>$(DAT)/dlb.lst)
-endif
        $(subst /,\,echo rumors >>$(DAT)/dlb.lst)
        $(subst /,\,echo help >>$(DAT)/dlb.lst)
        $(subst /,\,echo hh >>$(DAT)/dlb.lst)
@@ -1221,46 +1206,12 @@ ifneq "$(W_DAT)" ""
        if exist $(W_DAT)\bogusmon         del $(W_DAT)\bogusmon
        if exist $(W_DAT)\oracles          del $(W_DAT)\oracles
        if exist $(W_DAT)\rumors           del $(W_DAT)\rumors
-ifndef LUA_QTEXT_FILE
-       if exist $(W_DAT)\quest.dat        del $(W_DAT)\quest.dat
-endif
-ifdef OBSOLETE_DGN_COMPILER
-       if exist $(W_DAT)\dungeon          del $(W_DAT)\dungeon
-       if exist $(W_DAT)\dungeon.pdf      del $(W_DAT)\dungeon.pdf
-endif
        if exist $(W_DAT)\data             del $(W_DAT)\data
        if exist $(W_DAT)\options          del $(W_DAT)\options
        if exist $(W_DAT)\ttyoptions       del $(W_DAT)\ttyoptions
        if exist $(W_DAT)\guioptions       del $(W_DAT)\guioptions
        if exist $(W_DAT)\dlb.lst          del $(W_DAT)\dlb.lst
        if exist $(W_DAT)\porthelp         del $(W_DAT)\porthelp
-ifdef OBSOLETE_LEVEL_COMPILER
-       if exist $(W_DAT)\???-fil?.des     del $(W_DAT)\???-fil?.des
-       if exist $(W_DAT)\???-goal.des     del $(W_DAT)\???-goal.des
-       if exist $(W_DAT)\???-loca.des     del $(W_DAT)\???-loca.des
-       if exist $(W_DAT)\???-strt.des     del $(W_DAT)\???-strt.des
-       if exist $(W_DAT)\air.des          del $(W_DAT)\air.des
-       if exist $(W_DAT)\asmodeus.des     del $(W_DAT)\asmodeus.des
-       if exist $(W_DAT)\astral.des       del $(W_DAT)\astral.des
-       if exist $(W_DAT)\baalz.des        del $(W_DAT)\baalz.des
-       if exist $(W_DAT)\bigrm-*.des      del $(W_DAT)\bigrm-*.des
-       if exist $(W_DAT)\castle.des       del $(W_DAT)\castle.des
-       if exist $(W_DAT)\earth.des        del $(W_DAT)\earth.des
-       if exist $(W_DAT)\fakewiz?.des     del $(W_DAT)\fakewiz?.des
-       if exist $(W_DAT)\fire.des         del $(W_DAT)\fire.des
-       if exist $(W_DAT)\juiblex.des      del $(W_DAT)\juiblex.des
-       if exist $(W_DAT)\knox.des         del $(W_DAT)\knox.des
-       if exist $(W_DAT)\medusa-?.des     del $(W_DAT)\medusa-?.des
-       if exist $(W_DAT)\mine*.des        del $(W_DAT)\mine*.des
-       if exist $(W_DAT)\oracle.des       del $(W_DAT)\oracle.des
-       if exist $(W_DAT)\orcus.des        del $(W_DAT)\orcus.des
-       if exist $(W_DAT)\sanctum.des      del $(W_DAT)\sanctum.des
-       if exist $(W_DAT)\soko?-?.des      del $(W_DAT)\soko?-?.des
-       if exist $(W_DAT)\tower?.des       del $(W_DAT)\tower?.des
-       if exist $(W_DAT)\valley.des       del $(W_DAT)\valley.des
-       if exist $(W_DAT)\water.des        del $(W_DAT)\water.des
-       if exist $(W_DAT)\wizard?.des      del $(W_DAT)\wizard?.des
-endif
 endif
 ifneq "$(W_OBJ)" ""
        if exist $(W_OBJ)\sp_lev.tag       del $(W_OBJ)\sp_lev.tag
@@ -1310,6 +1261,7 @@ endif
 
 clean:
        if exist initialchk del initialchk
+       if exist $(W_INCL)\nhlua.h del $(W_INCL)\nhlua.h
        if exist $(O)install.tag del $(O)install.tag
        if exist $(O)utility.tag del $(O)utility.tag
 ifneq "$(W_UTIL)" ""