From fecf930ac0f23987a24c5b5f36f80166e7d61020 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 6 Nov 2019 19:47:37 -0500 Subject: [PATCH] Makefile updates --- sys/msdos/Makefile.GCC | 148 ++++------------------------------------- sys/winnt/Makefile.gcc | 63 +----------------- 2 files changed, 14 insertions(+), 197 deletions(-) diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 7a83f5086..fee192932 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -40,6 +40,15 @@ PDCURSES_TOP=../../pdcurses #--------------------------------------------------------------- # Location of LUA +# +# Original source needs to be obtained from: +# http://www.lua.org/ftp/lua-5.3.5.tar.gz +# +# This build assumes that the LUA sources are located +# at the specified location. If they are actually elsewhere +# you'll need to specify the correct spot below in order to +# successfully build NetHack-3.7. +# ADD_LUA=Y LUATOP=../../lua-535 @@ -215,19 +224,8 @@ ifneq "$(ADD_LUA)" "Y" SPLEVSRC = lev_yacc.c lev_$(LEX).c lev_main.c panic.c endif -DGNCOMPSRC = dgn_yacc.c dgn_$(LEX).c dgn_main.c - MAKEDEFSOBJS = $(O)makedefs.o $(O)monst.o $(O)objects.o -ifneq "$(ADD_LUA)" "Y" -SPLEVOBJS = $(O)lev_yacc.o $(O)lev_$(LEX).o $(O)lev_main.o $(O)alloc.o \ - $(O)monst.o $(O)objects.o $(O)panic.o \ - $(O)drawing.o $(O)decl.o $(O)stubvid.o -endif - -DGNCOMPOBJS = $(O)dgn_yacc.o $(O)dgn_$(LEX).o $(O)dgn_main.o $(O)alloc.o \ - $(O)panic.o - RECOVOBJS = $(O)recover.o @@ -588,8 +586,7 @@ else LEVCOMPEXE = endif $(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \ - $(INCL)/pm.h monstr.c vis_tab.c $(LEVCOMPEXE) \ - $(U)dgn_comp.exe $(TILEUTIL) + $(INCL)/pm.h monstr.c vis_tab.c $(TILEUTIL) $(subst /,\,echo utilities made > $@) tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe @@ -829,59 +826,6 @@ else endif endif -#========================================== -# Dungeon Dependencies -#========================================== - -$(U)dgn_comp.exe: $(DGNCOMPOBJS) - $(LINK) $(LFLAGS) -o$@ $(DGNCOMPOBJS) - -ifeq "$(DO_YACC)" "YACC_ACT" -$(U)dgn_yacc.c $(INCL)/dgn_comp.h : $(U)dgn_comp.y - @$(subst /,\,chdir $(UTIL)) - @$(subst /,\,$(YACC) -d dgn_comp.y) - @$(subst /,\,copy $(YTABC) dgn_yacc.c) - @$(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) - @$(subst /,\,@del $(YTABC)) - @$(subst /,\,@del $(YTABH)) - @$(subst /,\,chdir $(SRC)) -else -$(U)dgn_yacc.c: $(SSHR)/dgn_yacc.c - @echo --- - @echo For now, we will copy the prebuilt $(U)dgn_yacc.c and - @echo dgn_comp.h from $(SSHR) into $(U) and use that. - @$(subst /,\,copy $(SSHR)/dgn_yacc.c $(U)dgn_yacc.c) - @$(subst /,\,echo.>>$(U)dgn_yacc.c) - -$(INCL)/dgn_comp.h: $(SSHR)/dgn_comp.h - @echo --- - @echo For now, we will copy the prebuilt dgn_comp.h - @echo from $(SSHR) into $(INCL) and use that. - @$(subst /,\,copy $(SSHR)/dgn_comp.h $(INCL)/dgn_comp.h) - @$(subst /,\,echo.>>$(INCL)/dgn_comp.h) - -endif - -ifeq "$(DO_LEX)" "LEX_ACT" - -$(U)dgn_$(LEX).c: $(U)dgn_comp.l $(INCL)/dgn_comp.h - @$(subst /,\,chdir $(UTIL)) - @$(subst /,\,$(LEX) $(FLEXSKEL) dgn_comp.l) - @$(subst /,\,if exist $@ del $@) - @$(subst /,\,copy $(LEXYYC) $@) - @$(subst /,\,del $(LEXYYC)) - @$(subst /,\,chdir $(SRC)) -else - -$(U)dgn_$(LEX).c: $(SSHR)/dgn_lex.c $(INCL)/dgn_comp.h - @echo --- - @echo For now, we will copy the prebuilt dgn_lex.c - @echo from $(SSHR) into $(U) and use it. - @$(subst /,\,copy $(SSHR)/dgn_lex.c $@) - @$(subst /,\,echo.>>$@) - -endif - #========================================== # Recover Utility #========================================== @@ -1075,73 +1019,25 @@ $(DAT)/engrave: $(O)utility.tag $(DAT)/engrave.txt $(DAT)/epitaph: $(O)utility.tag $(DAT)/epitaph.txt @$(subst /,\,$(U)makedefs.exe -s) -ifneq "$(ADD_LUA)" "Y" -$(O)sp_lev.tag: $(O)utility.tag \ - $(DAT)/bigroom.des $(DAT)/castle.des \ - $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \ - $(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \ - $(DAT)/yendor.des $(DAT)/arch.des $(DAT)/barb.des \ - $(DAT)/caveman.des $(DAT)/healer.des $(DAT)/knight.des \ - $(DAT)/monk.des $(DAT)/priest.des $(DAT)/ranger.des \ - $(DAT)/rogue.des $(DAT)/samurai.des $(DAT)/tourist.des \ - $(DAT)/valkyrie.des $(DAT)/wizard.des - @$(subst /,\,cd $(DAT)) - @$(subst /,\,$(U)lev_comp bigroom.des) - @$(subst /,\,$(U)lev_comp castle.des) - @$(subst /,\,$(U)lev_comp endgame.des) - @$(subst /,\,$(U)lev_comp gehennom.des) - @$(subst /,\,$(U)lev_comp knox.des) - @$(subst /,\,$(U)lev_comp mines.des) - @$(subst /,\,$(U)lev_comp medusa.des) - @$(subst /,\,$(U)lev_comp oracle.des) - @$(subst /,\,$(U)lev_comp sokoban.des) - @$(subst /,\,$(U)lev_comp tower.des) - @$(subst /,\,$(U)lev_comp yendor.des) - @$(subst /,\,$(U)lev_comp arch.des) - @$(subst /,\,$(U)lev_comp barb.des) - @$(subst /,\,$(U)lev_comp caveman.des) - @$(subst /,\,$(U)lev_comp healer.des) - @$(subst /,\,$(U)lev_comp knight.des) - @$(subst /,\,$(U)lev_comp monk.des) - @$(subst /,\,$(U)lev_comp priest.des) - @$(subst /,\,$(U)lev_comp ranger.des) - @$(subst /,\,$(U)lev_comp rogue.des) - @$(subst /,\,$(U)lev_comp samurai.des) - @$(subst /,\,$(U)lev_comp tourist.des) - @$(subst /,\,$(U)lev_comp valkyrie.des) - @$(subst /,\,$(U)lev_comp wizard.des) - @$(subst /,\,cd $(SRC)) -else $(O)sp_lev.tag: $(O)utility.tag -endif @$(subst /,\,echo sp_levs done > $@) -$(DAT)/dungeon: $(O)utility.tag $(DAT)/dungeon.def - @$(subst /,\,$(U)makedefs.exe -e) - @$(subst /,\,cd $(DAT)) - @$(subst /,\,$(U)dgn_comp.exe dungeon.pdf) - @$(subst /,\,cd $(SRC)) - #========================================== # DLB stuff #========================================== #note that dir below assumes bin/dir.exe from djgpp distribution # -$(DAT)/nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/rumors $(DAT)/dungeon \ +$(DAT)/nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/rumors \ $(DAT)/oracles $(DAT)/quest.dat $(O)sp_lev.tag \ $(DAT)/bogusmon $(DAT)/engrave $(DAT)/epitaph $(DAT)/tribute @$(subst /,\,echo dat done >$(O)dat.tag) @$(subst /,\,cd $(DAT)) @$(subst /,\,copy $(MSYS)/msdoshlp.txt .) - @$(LS) data dungeon oracles options quest.dat rumors help hh >dlb.lst + @$(LS) data oracles options quest.dat rumors help hh >dlb.lst @$(LS) cmdhelp history opthelp wizhelp license msdoshlp.txt >>dlb.lst @$(LS) bogusmon engrave epitaph tribute >>dlb.lst -ifeq "$(ADD_LUA)" "Y" $(LS) $(subst /,\,*.lua) >>dlb.lst -else - $(LS) $(subst /,\,*.lev) >>dlb.lst -endif @$(subst /,\,$(U)dlb_main cvIf dlb.lst nhdat) @$(subst /,\,cd $(SRC)) @@ -1168,10 +1064,7 @@ clean: spotless: clean - $(subst /,\,if exist $(U)dgn_flex.c del $(U)dgn_flex.c) - $(subst /,\,if exist $(U)dgn_lex.c del $(U)dgn_lex.c) $(subst /,\,if exist $(U)makedefs.exe del $(U)makedefs.exe) - $(subst /,\,if exist $(U)dgn_comp.exe del $(U)dgn_comp.exe) $(subst /,\,if exist $(U)recover.exe del $(U)recover.exe) $(subst /,\,if exist $(U)tilemap.exe del $(U)tilemap.exe) $(subst /,\,if exist $(U)tile2bmp.exe del $(U)tile2bmp.exe) @@ -1183,16 +1076,12 @@ spotless: clean $(subst /,\,if exist $(INCL)/onames.h del $(INCL)/onames.h) $(subst /,\,if exist $(INCL)/pm.h del $(INCL)/pm.h) $(subst /,\,if exist $(INCL)/date.h del $(INCL)/date.h) - $(subst /,\,if exist $(INCL)/dgn_comp.h del $(INCL)/dgn_comp.h) - $(subst /,\,if exist $(INCL)/lev_comp.h del $(INCL)/lev_comp.h) $(subst /,\,if exist $(SRC)/monstr.c del $(SRC)/monstr.c) $(subst /,\,if exist $(SRC)/vis_tab.c del $(SRC)/vis_tab.c) $(subst /,\,if exist $(SRC)/tile.c del $(SRC)/tile.c) $(subst /,\,if exist $(DAT)/options del $(DAT)/options) $(subst /,\,if exist $(DAT)/data del $(DAT)/data) $(subst /,\,if exist $(DAT)/rumors del $(DAT)/rumors) - $(subst /,\,if exist $(DAT)/dungeon.pdf del $(DAT)/dungeon.pdf) - $(subst /,\,if exist $(DAT)/dungeon del $(DAT)/dungeon) $(subst /,\,if exist $(DAT)/oracles del $(DAT)/oracles) $(subst /,\,if exist $(DAT)/quest.dat del $(DAT)/quest.dat) $(subst /,\,if exist $(DAT)/bogusmon del $(DAT)/bogusmon) @@ -1200,7 +1089,6 @@ spotless: clean $(subst /,\,if exist $(DAT)/epitaph del $(DAT)/epitaph) $(subst /,\,if exist $(DAT)/dlb.lst del $(DAT)/dlb.lst) $(subst /,\,if exist $(DAT)/nhdat del $(DAT)/nhdat) - $(subst /,\,if exist $(DAT)/*.lev del $(DAT)/*.lev) $(subst /,\,if exist $(TILE_BMP) del $(TILE_BMP)) $(subst /,\,if exist $(WSHR)/monthin.txt del $(WSHR)/monthin.txt) $(subst /,\,if exist $(WSHR)/objthin.txt del $(WSHR)/objthin.txt) @@ -1258,10 +1146,7 @@ clean: spotless: clean - $(subst /,\,if exist $(U)dgn_flex.c del $(U)dgn_flex.c) - $(subst /,\,if exist $(U)dgn_lex.c del $(U)dgn_lex.c) $(subst /,\,if exist $(U)makedefs.exe del $(U)makedefs.exe) - $(subst /,\,if exist $(U)dgn_comp.exe del $(U)dgn_comp.exe) $(subst /,\,if exist $(U)recover.exe del $(U)recover.exe) $(subst /,\,if exist $(U)tilemap.exe del $(U)tilemap.exe) $(subst /,\,if exist $(U)tile2bmp.exe del $(U)tile2bmp.exe) @@ -1273,18 +1158,12 @@ spotless: clean $(subst /,\,if exist $(INCL)/onames.h del $(INCL)/onames.h) $(subst /,\,if exist $(INCL)/pm.h del $(INCL)/pm.h) $(subst /,\,if exist $(INCL)/date.h del $(INCL)/date.h) - $(subst /,\,if exist $(INCL)/dgn_comp.h del $(INCL)/dgn_comp.h) -ifneq "$(ADD_LUA)" "Y" - $(subst /,\,if exist $(INCL)/lev_comp.h del $(INCL)/lev_comp.h) -endif $(subst /,\,if exist $(SRC)/monstr.c del $(SRC)/monstr.c) $(subst /,\,if exist $(SRC)/vis_tab.c del $(SRC)/vis_tab.c) $(subst /,\,if exist $(SRC)/tile.c del $(SRC)/tile.c) $(subst /,\,if exist $(DAT)/options del $(DAT)/options) $(subst /,\,if exist $(DAT)/data del $(DAT)/data) $(subst /,\,if exist $(DAT)/rumors del $(DAT)/rumors) - $(subst /,\,if exist $(DAT)/dungeon.pdf del $(DAT)/dungeon.pdf) - $(subst /,\,if exist $(DAT)/dungeon del $(DAT)/dungeon) $(subst /,\,if exist $(DAT)/oracles del $(DAT)/oracles) $(subst /,\,if exist $(DAT)/quest.dat del $(DAT)/quest.dat) $(subst /,\,if exist $(DAT)/bogusmon del $(DAT)/bogusmon) @@ -1292,9 +1171,6 @@ endif $(subst /,\,if exist $(DAT)/epitaph del $(DAT)/epitaph) $(subst /,\,if exist $(DAT)/dlb.lst del $(DAT)/dlb.lst) $(subst /,\,if exist $(DAT)/nhdat del $(DAT)/nhdat) -ifneq "$(ADD_LUA)" "Y" - $(subst /,\,if exist $(DAT)/*.lev del $(DAT)/*.lev) -endif $(subst /,\,if exist $(TILE_BMP) del $(TILE_BMP)) $(subst /,\,if exist $(WSHR)/monthin.txt del $(WSHR)/monthin.txt) $(subst /,\,if exist $(WSHR)/objthin.txt del $(WSHR)/objthin.txt) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 55b6d2ebd..66399fab7 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -272,13 +272,8 @@ U = $(UTIL)/ MAKESRC = $(U)makedefs.c -DGNCOMPSRC = $(U)dgn_yacc.c $(U)dgn_lex.c $(U)dgn_main.c - MAKEOBJS = $(O)makedefs.o $(O)monst.o $(O)objects.o -DGNCOMPOBJS = $(O)dgn_yacc.o $(O)dgn_lex.o $(O)dgn_main.o \ - $(O)alloc.o $(O)panic.o - RECOVOBJS = $(O)recover.o TILEFILES = $(WSHR)/monsters.txt $(WSHR)/objects.txt $(WSHR)/other.txt @@ -791,8 +786,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(subst /,\,echo sp_levs done > $(O)sp_lev.tag) $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \ - $(SRC)/vis_tab.c $(INCL)/vis_tab.h \ - $(U)dgncomp.exe $(TILEUTIL16) + $(SRC)/vis_tab.c $(INCL)/vis_tab.h $(TILEUTIL16) $(subst /,\,@echo utilities made >$@) @echo utilities made. @@ -941,10 +935,6 @@ $(DAT)/epitaph: $(DAT)/epitaph.txt $(U)makedefs.exe $(DAT)/bogusmon: $(DAT)/bogusmon.txt $(U)makedefs.exe $(subst /,\,$(U)makedefs -s) -$(DAT)/dungeon: $(O)utility.tag $(DAT)/dungeon.def - $(subst /,\,$(U)makedefs -e) - $(subst /,\,$(U)dgncomp $(DAT)/dungeon.pdf) - #========================================== # uudecode utility and uuencoded targets #========================================== @@ -997,33 +987,6 @@ $(MSWIN)/splash.bmp: $(U)uudecode.exe $(MSWIN)/splash.uu $(subst /,\,copy splash.bmp $@) del splash.bmp -#========================================== -# Dungeon Compiler Stuff -#========================================== -$(U)dgn_yacc.c: $(U)dgn_comp.y - mingw32-make -C ../util -f ../win/win32/dgnstuff-mingw32.mak $(U)dgn_yacc.c - -$(INCL)/dgn_comp.h: - mingw32-make -C ../include -f ../win/win32/dgnstuff-mingw32.mak $(INCL)/dgn_comp.h - -$(U)dgn_lex.c: $(U)dgn_comp.l - mingw32-make -C ../util -f ../win/win32/dgnstuff-mingw32.mak $(U)dgn_lex.c - -$(O)dgn_yacc.o: $(HACK_H) $(DGN_FILE_H) $(INCL)/dgn_comp.h $(U)dgn_yacc.c - $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_yacc.c - -$(O)dgn_lex.o: $(HACK_H) $(DGN_FILE_H) $(INCL)\dgn_comp.h \ - $(U)dgn_lex.c - $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_lex.c - -$(O)dgn_main.o: $(HACK_H) $(U)dgn_main.c - $(cc) $(LEVCFLAGS) -o$@ $(U)dgn_main.c - -$(U)dgncomp.exe: $(DGNCOMPOBJS) - @echo Linking $@... - @echo Linking $@... - $(link) $(LFLAGSU) -o$@ $(DGNCOMPOBJS) - #================================================= # For a couple of devteam utilities #================================================= @@ -1066,7 +1029,7 @@ $(DAT)/porthelp: $(MSWSYS)/porthelp nhdat$(NHV): $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \ $(DAT)/quest.dat $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp $(DAT)/keyhelp \ - $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp $(DAT)/dungeon \ + $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp \ $(DAT)/porthelp $(DAT)/license $(DAT)/engrave \ $(DAT)/epitaph $(DAT)/bogusmon $(DAT)/tribute $(O)sp_lev.tag $(subst /,\,echo data >$(DAT)/dlb.lst) @@ -1084,7 +1047,6 @@ nhdat$(NHV): $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \ $(subst /,\,echo history >>$(DAT)/dlb.lst) $(subst /,\,echo opthelp >>$(DAT)/dlb.lst) $(subst /,\,echo wizhelp >>$(DAT)/dlb.lst) - $(subst /,\,echo dungeon >>$(DAT)/dlb.lst) $(subst /,\,echo license >>$(DAT)/dlb.lst) $(subst /,\,echo engrave >>$(DAT)/dlb.lst) $(subst /,\,echo epitaph >>$(DAT)/dlb.lst) @@ -1327,7 +1289,6 @@ clean: if exist $(O)utility.tag del $(O)utility.tag ifneq "$(W_UTIL)" "" if exist $(W_UTIL)\makedefs.exe del $(W_UTIL)\makedefs.exe - if exist $(W_UTIL)\dgncomp.exe del $(W_UTIL)\dgncomp.exe endif ifneq "$(W_SRC)" "" if exist $(W_SRC)\*.lnk del $(W_SRC)\*.lnk @@ -1338,8 +1299,6 @@ ifneq "$(W_OBJ)" "" if exist $(W_OBJ)\utility.tag del $(W_OBJ)\utility.tag if exist $(W_OBJ)\install.tag del $(W_OBJ)\install.tag if exist $(W_OBJ)\console.res del $(W_OBJ)\console.res - if exist $(W_OBJ)\dgncomp.MAP del $(W_OBJ)\dgncomp.MAP - if exist $(W_OBJ)\dgncomp.PDB del $(W_OBJ)\dgncomp.PDB if exist $(W_OBJ)\dlb_main.MAP del $(W_OBJ)\dlb_main.MAP if exist $(W_OBJ)\dlb_main.PDB del $(W_OBJ)\dlb_main.PDB if exist $(W_OBJ)\gamedir.tag del $(W_OBJ)\gamedir.tag @@ -1367,27 +1326,9 @@ ifneq "$(W_OBJ)" "" if exist $(W_OBJ)\uudecode.MAP del $(W_OBJ)\uudecode.MAP if exist $(W_OBJ)\uudecode.PDB del $(W_OBJ)\uudecode.PDB endif - rem - rem defer to the steps in ../win/win32/levstuff-mingw32.mak - rem - mingw32-make -f ../win/win32/levstuff-mingw32.mak clean - rem - rem defer to the steps in ../win/win32/dgnstuff-mingw32.mak - mingw32-make -f ../win/win32/dgnstuff-mingw32.mak clean $(subst /,\,if exist $(TILEBMP16) del $(TILEBMP16)) $(subst /,\,if exist $(TILEBMP32) del $(TILEBMP32)) -#clean: -# -test -f $(O)install.tag && del $(O)install.tag -# -test -f $(O)utility.tag && del $(O)utility.tag -# -test -f $(U)makedefs.exe && del $(U)makedefs.exe -# -test -f $(U)levcomp.exe && del $(U)levcomp.exe -# -test -f $(U)dgncomp.exe && del $(U)dgncomp.exe -# -del $(SRC)/*.lnk -# -del $(SRC)/*.map -# -test -f $(TILEBMP16) && del $(TILEBMP16) -# -test -f $(TILEBMP32) && del $(TILEBMP32) -# #=================================================================== # OTHER DEPENDENCIES #===================================================================