From db60679665906761d7f0fedf01116abd585346c2 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 24 Feb 2023 17:40:35 -0500 Subject: [PATCH] Windows: add lua files dependency --- sys/windows/Makefile.mingw32 | 31 ++++++++++++++++++++++++- sys/windows/Makefile.nmake | 45 +++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index f18d6e5eb..779078f1e 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -680,7 +680,7 @@ $(DAT)/epitaph: $(DAT)/bogusmon $(DAT)/bogusmon: $(U)makedefs.exe $(DAT)/bogusmon.txt $(DAT)/engrave.txt $(DAT)/epitaph.txt $< -s -$(DLBLST): | $(DAT_CLEAN) $(DAT_NOCLEAN) +$(DLBLST): $(LUAFILES) | $(DAT_CLEAN) $(DAT_NOCLEAN) echo data > $(DLBLST) echo oracles >> $(DLBLST) echo options >> $(DLBLST) @@ -841,6 +841,35 @@ $(error Error: Cannot proceed with fmod integration included) endif endif +#=========================================== +# Lua level files, dungeon file, quest files +#=========================================== + +LUALIST = air Arc-fila Arc-filb Arc-goal Arc-loca Arc-strt \ + asmodeus astral baalz Bar-fila Bar-filb Bar-goal \ + Bar-loca Bar-strt bigrm-1 bigrm-10 bigrm-11 bigrm-2 \ + bigrm-3 bigrm-4 bigrm-5 bigrm-6 bigrm-7 bigrm-8 \ + bigrm-9 castle Cav-fila Cav-filb Cav-goal Cav-loca \ + Cav-strt dungeon earth fakewiz1 fakewiz2 fire \ + Hea-fila Hea-filb Hea-goal Hea-loca Hea-strt hellfill \ + juiblex Kni-fila Kni-filb Kni-goal Kni-loca Kni-strt \ + knox medusa-1 medusa-2 medusa-3 medusa-4 minefill \ + minend-1 minend-2 minend-3 minetn-1 minetn-2 minetn-3 \ + minetn-4 minetn-5 minetn-6 minetn-7 Mon-fila Mon-filb \ + Mon-goal Mon-loca Mon-strt nhcore nhlib oracle \ + orcus Pri-fila Pri-filb Pri-goal Pri-loca Pri-strt \ + quest Ran-fila Ran-filb Ran-goal Ran-loca Ran-strt \ + Rog-fila Rog-filb Rog-goal Rog-loca Rog-strt Sam-fila \ + Sam-filb Sam-goal Sam-loca Sam-strt sanctum soko1-1 \ + soko1-2 soko2-1 soko2-2 soko3-1 soko3-2 soko4-1 \ + soko4-2 themerms Tou-fila Tou-filb Tou-goal Tou-loca \ + Tou-strt tower1 tower2 tower3 Val-fila Val-filb \ + Val-goal Val-loca Val-strt valley water Wiz-fila \ + Wiz-filb Wiz-goal Wiz-loca Wiz-strt wizard1 wizard2 \ + wizard3 + +LUAFILES = $(addprefix $(DAT)/, $(addsuffix .lua, $(LUALIST))) + #========================================== # Soundlib Support #========================================== diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index e3ab6fe52..fe172bac5 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -481,6 +481,49 @@ HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \ vault.c version.c vision.c weapon.c were.c wield.c \ windows.c wizard.c worm.c worn.c write.c zap.c +LUA_FILES = $(DAT)\air.lua $(DAT)\Arc-fila.lua $(DAT)\Arc-filb.lua \ + $(DAT)\Arc-goal.lua $(DAT)\Arc-loca.lua $(DAT)\Arc-strt.lua \ + $(DAT)\asmodeus.lua $(DAT)\astral.lua $(DAT)\baalz.lua \ + $(DAT)\Bar-fila.lua $(DAT)\Bar-filb.lua $(DAT)\Bar-goal.lua \ + $(DAT)\Bar-loca.lua $(DAT)\Bar-strt.lua $(DAT)\bigrm-1.lua \ + $(DAT)\bigrm-10.lua $(DAT)\bigrm-11.lua $(DAT)\bigrm-2.lua \ + $(DAT)\bigrm-3.lua $(DAT)\bigrm-4.lua $(DAT)\bigrm-5.lua \ + $(DAT)\bigrm-6.lua $(DAT)\bigrm-7.lua $(DAT)\bigrm-8.lua \ + $(DAT)\bigrm-9.lua $(DAT)\castle.lua $(DAT)\Cav-fila.lua \ + $(DAT)\Cav-filb.lua $(DAT)\Cav-goal.lua $(DAT)\Cav-loca.lua \ + $(DAT)\Cav-strt.lua $(DAT)\dungeon.lua $(DAT)\earth.lua \ + $(DAT)\fakewiz1.lua $(DAT)\fakewiz2.lua $(DAT)\fire.lua \ + $(DAT)\Hea-fila.lua $(DAT)\Hea-filb.lua $(DAT)\Hea-goal.lua \ + $(DAT)\Hea-loca.lua $(DAT)\Hea-strt.lua $(DAT)\hellfill.lua \ + $(DAT)\juiblex.lua $(DAT)\Kni-fila.lua $(DAT)\Kni-filb.lua \ + $(DAT)\Kni-goal.lua $(DAT)\Kni-loca.lua $(DAT)\Kni-strt.lua \ + $(DAT)\knox.lua $(DAT)\medusa-1.lua $(DAT)\medusa-2.lua \ + $(DAT)\medusa-3.lua $(DAT)\medusa-4.lua $(DAT)\minefill.lua \ + $(DAT)\minend-1.lua $(DAT)\minend-2.lua $(DAT)\minend-3.lua \ + $(DAT)\minetn-1.lua $(DAT)\minetn-2.lua $(DAT)\minetn-3.lua \ + $(DAT)\minetn-4.lua $(DAT)\minetn-5.lua $(DAT)\minetn-6.lua \ + $(DAT)\minetn-7.lua $(DAT)\Mon-fila.lua $(DAT)\Mon-filb.lua \ + $(DAT)\Mon-goal.lua $(DAT)\Mon-loca.lua $(DAT)\Mon-strt.lua \ + $(DAT)\nhcore.lua $(DAT)\nhlib.lua $(DAT)\oracle.lua \ + $(DAT)\orcus.lua $(DAT)\Pri-fila.lua $(DAT)\Pri-filb.lua \ + $(DAT)\Pri-goal.lua $(DAT)\Pri-loca.lua $(DAT)\Pri-strt.lua \ + $(DAT)\quest.lua $(DAT)\Ran-fila.lua $(DAT)\Ran-filb.lua \ + $(DAT)\Ran-goal.lua $(DAT)\Ran-loca.lua $(DAT)\Ran-strt.lua \ + $(DAT)\Rog-fila.lua $(DAT)\Rog-filb.lua $(DAT)\Rog-goal.lua \ + $(DAT)\Rog-loca.lua $(DAT)\Rog-strt.lua $(DAT)\Sam-fila.lua \ + $(DAT)\Sam-filb.lua $(DAT)\Sam-goal.lua $(DAT)\Sam-loca.lua \ + $(DAT)\Sam-strt.lua $(DAT)\sanctum.lua $(DAT)\soko1-1.lua \ + $(DAT)\soko1-2.lua $(DAT)\soko2-1.lua $(DAT)\soko2-2.lua \ + $(DAT)\soko3-1.lua $(DAT)\soko3-2.lua $(DAT)\soko4-1.lua \ + $(DAT)\soko4-2.lua $(DAT)\themerms.lua $(DAT)\Tou-fila.lua \ + $(DAT)\Tou-filb.lua $(DAT)\Tou-goal.lua $(DAT)\Tou-loca.lua \ + $(DAT)\Tou-strt.lua $(DAT)\tower1.lua $(DAT)\tower2.lua \ + $(DAT)\tower3.lua $(DAT)\Val-fila.lua $(DAT)\Val-filb.lua \ + $(DAT)\Val-goal.lua $(DAT)\Val-loca.lua $(DAT)\Val-strt.lua \ + $(DAT)\valley.lua $(DAT)\water.lua $(DAT)\Wiz-fila.lua \ + $(DAT)\Wiz-filb.lua $(DAT)\Wiz-goal.lua $(DAT)\Wiz-loca.lua \ + $(DAT)\Wiz-strt.lua $(DAT)\wizard1.lua $(DAT)\wizard2.lua \ + $(DAT)\wizard3.lua # # Utility Objects. # @@ -1716,7 +1759,7 @@ $(OGUI)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h $(DAT)\porthelp: $(MSWSYS)\porthelp @copy $(MSWSYS)\porthelp $@ >nul -nhdat$(NHV): $(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(DAT)\quest.lua \ +nhdat$(NHV): $(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(LUA_FILES) \ $(DAT)\rumors $(DAT)\help $(DAT)\hh $(DAT)\cmdhelp $(DAT)\keyhelp \ $(DAT)\history $(DAT)\opthelp $(DAT)\optmenu $(DAT)\wizhelp $(DAT)\porthelp \ $(DAT)\license $(DAT)\engrave $(DAT)\epitaph $(DAT)\bogusmon $(DAT)\tribute -- 2.50.1