diff --git a/sys/amiga/Makefile.agc b/sys/amiga/Makefile.agc index 971f64d1b..dc234e406 100644 --- a/sys/amiga/Makefile.agc +++ b/sys/amiga/Makefile.agc @@ -1015,7 +1015,7 @@ $(O)allmain.o: $(NHS)allmain.c $(HDEP) $(O)alloc.o: $(NHS)alloc.c $(I)config.h -$(O)apply.o: $(NHS)apply.c $(HDEP) $(I)edog.h +$(O)apply.o: $(NHS)apply.c $(HDEP) $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)apply.c $(O)artifact.o: $(NHS)artifact.c $(HDEP) $(I)artifact.h $(I)artilist.h @@ -1036,7 +1036,7 @@ $(O)decl.o: $(NHS)decl.c $(HDEP) $(I)quest.h $(O)detect.o: $(NHS)detect.c $(HDEP) $(I)artifact.h -$(O)dig.o: $(NHS)dig.c $(HDEP) $(I)edog.h +$(O)dig.o: $(NHS)dig.c $(HDEP) $(O)display.o: $(NHS)display.c $(HDEP) @@ -1048,11 +1048,11 @@ $(O)do_name.o: $(NHS)do_name.c $(HDEP) $(O)do_wear.o: $(NHS)do_wear.c $(HDEP) -$(O)dog.o: $(NHS)dog.c $(HDEP) $(I)edog.h +$(O)dog.o: $(NHS)dog.c $(HDEP) -$(O)dogmove.o: $(NHS)dogmove.c $(HDEP) $(I)mfndpos.h $(I)edog.h +$(O)dogmove.o: $(NHS)dogmove.c $(HDEP) $(I)mfndpos.h -$(O)dokick.o: $(NHS)dokick.c $(HDEP) $(I)eshk.h +$(O)dokick.o: $(NHS)dokick.c $(HDEP) $(O)dothrow.o: $(NHS)dothrow.c $(HDEP) @@ -1063,7 +1063,7 @@ $(O)dungeon.o: $(NHS)dungeon.c $(HDEP) $(I)dgn_file.h $(I)dlb.h $(O)eat.o: $(NHS)eat.c $(HDEP) -$(O)end.o: $(NHS)end.c $(HDEP) $(I)eshk.h $(I)lev.h $(I)dlb.h +$(O)end.o: $(NHS)end.c $(HDEP) $(I)lev.h $(I)dlb.h $(O)engrave.o: $(NHS)engrave.c $(HDEP) $(I)lev.h @@ -1089,18 +1089,18 @@ $(O)lock.o: $(NHS)lock.c $(HDEP) $(O)mail.o: $(NHS)mail.c $(HDEP) $(I)mail.h -$(O)makemon.o: $(NHS)makemon.c $(HDEP) $(I)epri.h $(I)emin.h $(I)edog.h +$(O)makemon.o: $(NHS)makemon.c $(HDEP) $(O)mapglyph.o: $(NHS)mapglyph.c $(HDEP) $(O)mcastu.o: $(NHS)mcastu.c $(HDEP) -$(O)mhitm.o: $(NHS)mhitm.c $(HDEP) $(I)artifact.h $(I)edog.h +$(O)mhitm.o: $(NHS)mhitm.c $(HDEP) $(I)artifact.h -$(O)mhitu.o: $(NHS)mhitu.c $(HDEP) $(I)artifact.h $(I)edog.h +$(O)mhitu.o: $(NHS)mhitu.c $(HDEP) $(I)artifact.h $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)mhitu.c -$(O)minion.o: $(NHS)minion.c $(HDEP) $(I)emin.h $(I)epri.h +$(O)minion.o: $(NHS)minion.c $(HDEP) $(O)mklev.o: $(NHS)mklev.c $(HDEP) @@ -1112,14 +1112,14 @@ $(O)mkobj.o: $(NHS)mkobj.c $(HDEP) $(I)artifact.h $(I)prop.h $(O)mkroom.o: $(NHS)mkroom.c $(HDEP) -$(O)mon.o: $(NHS)mon.c $(HDEP) $(I)mfndpos.h $(I)edog.h +$(O)mon.o: $(NHS)mon.c $(HDEP) $(I)mfndpos.h -$(O)mondata.o: $(NHS)mondata.c $(HDEP) $(I)eshk.h $(I)epri.h +$(O)mondata.o: $(NHS)mondata.c $(HDEP) $(O)monmove.o: $(NHS)monmove.c $(HDEP) $(I)mfndpos.h $(I)artifact.h $(O)monst.o: $(NHS)monst.c $(I)config.h $(I)permonst.h $(I)monsym.h \ - $(I)eshk.h $(I)vault.h $(I)epri.h $(I)color.h + $(I)color.h $(O)monstr.o: $(NHS)monstr.c $(HDEP) @@ -1147,16 +1147,15 @@ $(O)pager.o: $(NHS)pager.c $(HDEP) $(I)dlb.h $(O)pickup.o: $(NHS)pickup.c $(HDEP) -$(O)pline.o: $(NHS)pline.c $(HDEP) $(I)epri.h +$(O)pline.o: $(NHS)pline.c $(HDEP) $(O)polyself.o: $(NHS)polyself.c $(HDEP) $(O)potion.o: $(NHS)potion.c $(HDEP) -$(O)pray.o: $(NHS)pray.c $(HDEP) $(I)epri.h +$(O)pray.o: $(NHS)pray.c $(HDEP) -$(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h $(I)eshk.h $(I)epri.h \ - $(I)emin.h +$(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h $(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h $(I)qtext.h @@ -1178,14 +1177,14 @@ $(O)rumors.o: $(NHS)rumors.c $(HDEP) $(I)dlb.h $(O)save.o: $(NHS)save.c $(HDEP) $(I)lev.h $(I)quest.h -$(O)shk.o: $(NHS)shk.c $(HDEP) $(I)eshk.h +$(O)shk.o: $(NHS)shk.c $(HDEP) $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)shk.c -$(O)shknam.o: $(NHS)shknam.c $(HDEP) $(I)eshk.h +$(O)shknam.o: $(NHS)shknam.c $(HDEP) $(O)sit.o: $(NHS)sit.c $(HDEP) $(I)artifact.h -$(O)sounds.o: $(NHS)sounds.c $(HDEP) $(I)edog.h +$(O)sounds.o: $(NHS)sounds.c $(HDEP) $(O)sp_lev.o: $(NHS)sp_lev.c $(HDEP) $(I)sp_lev.h $(I)rect.h $(I)dlb.h @@ -1211,7 +1210,7 @@ $(O)u_init.o: $(NHS)u_init.c $(HDEP) $(O)uhitm.o: $(NHS)uhitm.c $(HDEP) $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)uhitm.c -$(O)vault.o: $(NHS)vault.c $(HDEP) $(I)vault.h +$(O)vault.o: $(NHS)vault.c $(HDEP) $(O)version.o: $(NHS)version.c $(HDEP) $(I)date.h $(I)patchlevel.h @@ -1296,27 +1295,19 @@ $(I)dungeon.h: $(I)align.h -setdate $(I)dungeon.h -c:wait 2 -$(I)emin.h: $(I)dungeon.h - -setdate $(I)emin.h - -c:wait 2 - -$(I)epri.h: $(I)dungeon.h $(I)align.h - -setdate $(I)epri.h - -c:wait 2 - -$(I)eshk.h: $(I)dungeon.h - -setdate $(I)eshk.h - -c:wait 2 - $(I)engrave.h: $(I)trampoli.h $(I)rect.h -setdate $(I)engrave.h -c:wait 2 +$(I)mextra.h: $(I)align.h + -setdate $(I)mextra.h + -c:wait 2 + $(I)mondata.h: $(I)align.h -setdate $(I)mondata.h -c:wait 2 -$(I)monst.h: $(I)align.h +$(I)monst.h: $(I)align.h $(I)mextra.h -setdate $(I)monst.h -c:wait 2 @@ -1328,9 +1319,6 @@ $(I)rm.h: $(I)align.h -setdate $(I)rm.h -c:wait 2 -$(I)vault.h: $(I)dungeon.h - -setdate $(I)vault.h - -c:wait 2 #notes # install keeps doing re-install because it keeps rebuilding lev_comp??? diff --git a/sys/amiga/Makefile.ami b/sys/amiga/Makefile.ami index 971911e8a..a583c8a5e 100644 --- a/sys/amiga/Makefile.ami +++ b/sys/amiga/Makefile.ami @@ -1347,7 +1347,7 @@ $(O)allmain.o: $(NHS)allmain.c $(HDEP) $(O)alloc.o: $(NHS)alloc.c $(I)config.h -$(O)apply.o: $(NHS)apply.c $(HDEP) $(I)edog.h +$(O)apply.o: $(NHS)apply.c $(HDEP) #SFD_INSTEAD #none $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)apply.c @@ -1369,7 +1369,7 @@ $(O)decl.o: $(NHS)decl.c $(HDEP) $(I)quest.h $(O)detect.o: $(NHS)detect.c $(HDEP) $(I)artifact.h -$(O)dig.o: $(NHS)dig.c $(HDEP) $(I)edog.h +$(O)dig.o: $(NHS)dig.c $(HDEP) $(O)display.o: $(NHS)display.c $(HDEP) @@ -1381,11 +1381,11 @@ $(O)do_name.o: $(NHS)do_name.c $(HDEP) $(O)do_wear.o: $(NHS)do_wear.c $(HDEP) -$(O)dog.o: $(NHS)dog.c $(HDEP) $(I)edog.h +$(O)dog.o: $(NHS)dog.c $(HDEP) -$(O)dogmove.o: $(NHS)dogmove.c $(HDEP) $(I)mfndpos.h $(I)edog.h +$(O)dogmove.o: $(NHS)dogmove.c $(HDEP) $(I)mfndpos.h -$(O)dokick.o: $(NHS)dokick.c $(HDEP) $(I)eshk.h +$(O)dokick.o: $(NHS)dokick.c $(HDEP) $(O)dothrow.o: $(NHS)dothrow.c $(HDEP) @@ -1396,7 +1396,7 @@ $(O)dungeon.o: $(NHS)dungeon.c $(HDEP) $(I)dgn_file.h $(I)dlb.h $(O)eat.o: $(NHS)eat.c $(HDEP) -$(O)end.o: $(NHS)end.c $(HDEP) $(I)eshk.h $(I)lev.h $(I)dlb.h +$(O)end.o: $(NHS)end.c $(HDEP) $(I)lev.h $(I)dlb.h $(O)engrave.o: $(NHS)engrave.c $(HDEP) $(I)lev.h @@ -1422,18 +1422,18 @@ $(O)lock.o: $(NHS)lock.c $(HDEP) $(O)mail.o: $(NHS)mail.c $(HDEP) $(I)mail.h -$(O)makemon.o: $(NHS)makemon.c $(HDEP) $(I)epri.h $(I)emin.h $(I)edog.h +$(O)makemon.o: $(NHS)makemon.c $(HDEP) $(O)mapglyph.o: $(NHS)mapglyph.c $(HDEP) $(O)mcastu.o: $(NHS)mcastu.c $(HDEP) -$(O)mhitm.o: $(NHS)mhitm.c $(HDEP) $(I)artifact.h $(I)edog.h +$(O)mhitm.o: $(NHS)mhitm.c $(HDEP) $(I)artifact.h -$(O)mhitu.o: $(NHS)mhitu.c $(HDEP) $(I)artifact.h $(I)edog.h +$(O)mhitu.o: $(NHS)mhitu.c $(HDEP) $(I)artifact.h $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)mhitu.c -$(O)minion.o: $(NHS)minion.c $(HDEP) $(I)emin.h $(I)epri.h +$(O)minion.o: $(NHS)minion.c $(HDEP) $(O)mklev.o: $(NHS)mklev.c $(HDEP) @@ -1445,14 +1445,13 @@ $(O)mkobj.o: $(NHS)mkobj.c $(HDEP) $(I)artifact.h $(I)prop.h $(O)mkroom.o: $(NHS)mkroom.c $(HDEP) -$(O)mon.o: $(NHS)mon.c $(HDEP) $(I)mfndpos.h $(I)edog.h +$(O)mon.o: $(NHS)mon.c $(HDEP) $(I)mfndpos.h -$(O)mondata.o: $(NHS)mondata.c $(HDEP) $(I)eshk.h $(I)epri.h +$(O)mondata.o: $(NHS)mondata.c $(HDEP) $(O)monmove.o: $(NHS)monmove.c $(HDEP) $(I)mfndpos.h $(I)artifact.h -$(O)monst.o: $(NHS)monst.c $(I)config.h $(I)permonst.h $(I)monsym.h \ - $(I)eshk.h $(I)vault.h $(I)epri.h $(I)color.h +$(O)monst.o: $(NHS)monst.c $(I)config.h $(I)permonst.h $(I)monsym.h $(I)color.h $(O)monstr.o: $(NHS)monstr.c $(HDEP) #SFD_INSTEAD $(CC) $(CFLAGS) $(OBJSPEC)%(left) $(NHS)monstr.c @@ -1483,16 +1482,15 @@ $(O)pager.o: $(NHS)pager.c $(HDEP) $(I)dlb.h $(O)pickup.o: $(NHS)pickup.c $(HDEP) -$(O)pline.o: $(NHS)pline.c $(HDEP) $(I)epri.h +$(O)pline.o: $(NHS)pline.c $(HDEP) $(O)polyself.o: $(NHS)polyself.c $(HDEP) $(O)potion.o: $(NHS)potion.c $(HDEP) -$(O)pray.o: $(NHS)pray.c $(HDEP) $(I)epri.h +$(O)pray.o: $(NHS)pray.c $(HDEP) -$(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h $(I)eshk.h $(I)epri.h \ - $(I)emin.h +$(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h $(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h $(I)qtext.h @@ -1514,15 +1512,15 @@ $(O)rumors.o: $(NHS)rumors.c $(HDEP) $(I)dlb.h $(O)save.o: $(NHS)save.c $(HDEP) $(I)lev.h $(I)quest.h -$(O)shk.o: $(NHS)shk.c $(HDEP) $(I)eshk.h +$(O)shk.o: $(NHS)shk.c $(HDEP) #SFD_INSTEAD #none $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)shk.c -$(O)shknam.o: $(NHS)shknam.c $(HDEP) $(I)eshk.h +$(O)shknam.o: $(NHS)shknam.c $(HDEP) $(O)sit.o: $(NHS)sit.c $(HDEP) $(I)artifact.h -$(O)sounds.o: $(NHS)sounds.c $(HDEP) $(I)edog.h +$(O)sounds.o: $(NHS)sounds.c $(HDEP) $(O)sp_lev.o: $(NHS)sp_lev.c $(HDEP) $(I)sp_lev.h $(I)rect.h $(I)dlb.h @@ -1549,7 +1547,7 @@ $(O)u_init.o: $(NHS)u_init.c $(HDEP) $(O)uhitm.o: $(NHS)uhitm.c $(HDEP) $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)uhitm.c -$(O)vault.o: $(NHS)vault.c $(HDEP) $(I)vault.h +$(O)vault.o: $(NHS)vault.c $(HDEP) $(O)version.o: $(NHS)version.c $(HDEP) $(I)date.h $(I)patchlevel.h @@ -1618,7 +1616,7 @@ $(I)permonst.h: $(I)monattk.h $(I)monflag.h $(I)align.h -setdate $(I)permonst.h -wait 2 -$(I)you.h: $(I)align.h $(I)attrib.h $(I)monst.h $(I)youprop.h $(I)skills.h +$(I)you.h: $(I)align.h $(I)attrib.h $(I)mextra.h $(I)monst.h $(I)youprop.h $(I)skills.h -setdate $(I)you.h -wait 2 @@ -1636,27 +1634,19 @@ $(I)dungeon.h: $(I)align.h -setdate $(I)dungeon.h -wait 2 -$(I)emin.h: $(I)dungeon.h - -setdate $(I)emin.h - -wait 2 - -$(I)epri.h: $(I)dungeon.h $(I)align.h - -setdate $(I)epri.h - -wait 2 - -$(I)eshk.h: $(I)dungeon.h - -setdate $(I)eshk.h - -wait 2 - $(I)engrave.h: $(I)trampoli.h $(I)rect.h -setdate $(I)engrave.h -wait 2 +$(I)mextra.h: $(I)align.h + -setdate $(I)mextra.h + -wait 2 + $(I)mondata.h: $(I)align.h -setdate $(I)mondata.h -wait 2 -$(I)monst.h: $(I)align.h +$(I)monst.h: $(I)align.h $(I)mextra.h -setdate $(I)monst.h -wait 2 @@ -1668,10 +1658,6 @@ $(I)rm.h: $(I)align.h -setdate $(I)rm.h -wait 2 -$(I)vault.h: $(I)dungeon.h - -setdate $(I)vault.h - -wait 2 - #notes # install keeps doing re-install because it keeps rebuilding lev_comp??? diff --git a/sys/msdos/Makefile.BC b/sys/msdos/Makefile.BC index 3c215b350..cc0f6cde2 100644 --- a/sys/msdos/Makefile.BC +++ b/sys/msdos/Makefile.BC @@ -1,5 +1,5 @@ -# SCCS Id: @(#)Makefile.BC 3.5 2005/10/02 -# Copyright (c) Yitzhak Sapir, 1999-2005. +# SCCS Id: @(#)Makefile.BC 3.5 2006/01/05 +# Copyright (c) Yitzhak Sapir, 1999-2006. # NetHack may be freely distributed. See license for details. # @@ -854,7 +854,8 @@ PCCONF_H = $(INCL)\pcconf.h $(INCL)\micro.h $(INCL)\system.h PERMONST_H = $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\align.h YOUPROP_H = $(INCL)\prop.h $(PERMONST_H) $(INCL)\pm.h $(INCL)\youprop.h \ $(INCL)\mondata.h -YOU_H = $(INCL)\attrib.h $(INCL)\monst.h $(YOUPROP_H) $(INCL)\align.h +YOU_H = $(INCL)\attrib.h $(INCL)\mextra.h $(INCL)\monst.h $(YOUPROP_H) \ + $(INCL)\align.h DECL_H = $(INCL)\quest.h $(INCL)\spell.h $(INCL)\color.h \ $(INCL)\obj.h $(YOU_H) $(INCL)\onames.h $(INCL)\pm.h @@ -875,10 +876,6 @@ COLOR_H = $(INCL)\color.h DATE_H = $(INCL)\date.h DGN_FILE_H = $(INCL)\dgn_file.h DLB_H = $(INCL)\dlb.h -EMIN_H = $(INCL)\emin.h -EPRI_H = $(INCL)\epri.h -ESHK_H = $(INCL)\eshk.h -EDOG_H = $(INCL)\edog.h FUNC_TAB_H = $(INCL)\func_tab.h LEV_H = $(INCL)\lev.h LEV_COMP_H = $(INCL)\lev_comp.h @@ -893,7 +890,6 @@ QTEXT_H = $(INCL)\qtext.h QUEST_H = $(INCL)\quest.h SP_LEV_H = $(INCL)\sp_lev.h TERMCAP_H = $(INCL)\tcap.h -VAULT_H = $(INCL)\vault.h VIS_TAB_H = $(INCL)\vis_tab.h WINTTY_H = $(INCL)\wintty.h @@ -1800,21 +1796,21 @@ $(O)ball.o: $(PCHO) $(SRC)\ball.c $(HACK_H) $(O)bones.o: $(PCHO) $(SRC)\bones.c $(HACK_H) $(LEV_H) $(O)decl.o: $(PCHO) $(SRC)\decl.c $(HACK_H) $(QUEST_H) $(O)detect.o: $(PCHO) $(SRC)\detect.c $(HACK_H) $(ARTIFACT_H) -$(O)dig.o: $(PCHO) $(SRC)\dig.c $(HACK_H) $(EDOG_H) # check dep +$(O)dig.o: $(PCHO) $(SRC)\dig.c $(HACK_H) # check dep $(O)display.o: $(PCHO) $(SRC)\display.c $(HACK_H) $(O)dlb.o: $(SRC)\dlb.c $(DLB_H) $(HACK_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\dlb.c -$(O)dokick.o: $(PCHO) $(SRC)\dokick.c $(HACK_H) $(ESHK_H) +$(O)dokick.o: $(PCHO) $(SRC)\dokick.c $(HACK_H) $(O)dothrow.o: $(PCHO) $(SRC)\dothrow.c $(HACK_H) $(O)drawing.o: $(SRC)\drawing.c $(HACK_H) $(TERMCAP_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\drawing.c -$(O)end.o: $(SRC)\end.c $(HACK_H) $(ESHK_H) $(LEV_H) $(DLB_H) +$(O)end.o: $(SRC)\end.c $(HACK_H) $(LEV_H) $(DLB_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) @@ -1824,12 +1820,12 @@ $(O)extralev.o: $(PCHO) $(SRC)\extralev.c $(HACK_H) $(O)files.o: $(PCHO) $(SRC)\files.c $(HACK_H) $(DLB_H) $(O)fountain.o: $(PCHO) $(SRC)\fountain.c $(HACK_H) $(O)mapglyph.o: $(PCHO) $(SRC)\mapglyph.c $(HACK_H) -$(O)minion.o: $(PCHO) $(SRC)\minion.c $(HACK_H) $(EMIN_H) $(EPRI_H) +$(O)minion.o: $(PCHO) $(SRC)\minion.c $(HACK_H) $(O)mklev.o: $(PCHO) $(SRC)\mklev.c $(HACK_H) $(O)mkmap.o: $(PCHO) $(SRC)\mkmap.c $(HACK_H) $(SP_LEV_H) $(O)mkmaze.o: $(PCHO) $(SRC)\mkmaze.c $(HACK_H) $(SP_LEV_H) $(LEV_H) $(O)monst.o: $(SRC)\monst.c $(CONFIG_H) $(PERMONST_H) $(MONSYM_H) \ - $(ESHK_H) $(EPRI_H) $(COLOR_H) $(ALIGN_H) + $(COLOR_H) $(ALIGN_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) @@ -1860,7 +1856,7 @@ $(O)pager.o: $(SRC)\pager.c $(HACK_H) $(DLB_H) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGNO) $(COBJNAM)$@ $(SRC)\pager.c $(O)pickup.o: $(PCHO) $(SRC)\pickup.c $(HACK_H) -$(O)pray.o: $(PCHO) $(SRC)\pray.c $(HACK_H) $(EPRI_H) +$(O)pray.o: $(PCHO) $(SRC)\pray.c $(HACK_H) $(O)quest.o: $(PCHO) $(SRC)\quest.c $(HACK_H) $(QUEST_H) $(QTEXT_H) $(O)questpgr.o: $(PCHO) $(SRC)\questpgr.c $(HACK_H) $(QTEXT_H) $(DLB_H) $(O)rect.o: $(PCHO) $(SRC)\rect.c $(HACK_H) @@ -1901,7 +1897,7 @@ $(O)write.o: $(PCHO) $(SRC)\write.c $(HACK_H) # $(O)allmain.0: $(PCH0) $(SRC)\allmain.c $(HACK_H) -$(O)apply.0: $(PCH0) $(SRC)\apply.c $(HACK_H) $(EDOG_H) +$(O)apply.0: $(PCH0) $(SRC)\apply.c $(HACK_H) $(O)artifact.0: $(PCH0) $(SRC)\artifact.c $(HACK_H) $(ARTIFACT_H) $(ARTILIST_H) $(O)attrib.0: $(PCH0) $(SRC)\attrib.c $(HACK_H) $(O)botl.0: $(PCH0) $(SRC)\botl.c $(HACK_H) @@ -1910,39 +1906,38 @@ $(O)dbridge.0: $(PCH0) $(SRC)\dbridge.c $(HACK_H) $(O)do.0: $(PCH0) $(SRC)\do.c $(HACK_H) $(LEV_H) $(O)do_name.0: $(PCH0) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.0: $(PCH0) $(SRC)\do_wear.c $(HACK_H) -$(O)dogmove.0: $(PCH0) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) +$(O)dogmove.0: $(PCH0) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) $(O)dungeon.0: $(PCH0) $(SRC)\dungeon.c $(HACK_H) $(ALIGN_H) $(DGN_FILE_H) \ $(DLB_H) -$(O)eat.0: $(PCH0) $(SRC)\eat.c $(HACK_H) $(EDOG_H) +$(O)eat.0: $(PCH0) $(SRC)\eat.c $(HACK_H) $(O)engrave.0: $(PCH0) $(SRC)\engrave.c $(HACK_H) $(LEV_H) $(O)explode.0: $(PCH0) $(SRC)\explode.c $(HACK_H) $(O)hacklib.0: $(PCH0) $(SRC)\hacklib.c $(HACK_H) $(O)invent.0: $(PCH0) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) $(O)lock.0: $(PCH0) $(SRC)\lock.c $(HACK_H) $(O)mail.0: $(PCH0) $(SRC)\mail.c $(HACK_H) $(MAIL_H) $(DATE_H) -$(O)makemon.0: $(PCH0) $(SRC)\makemon.c $(HACK_H) $(EPRI_H) $(EMIN_H) +$(O)makemon.0: $(PCH0) $(SRC)\makemon.c $(HACK_H) $(O)mcastu.0: $(PCH0) $(SRC)\mcastu.c $(HACK_H) -$(O)mhitm.0: $(PCH0) $(SRC)\mhitm.c $(HACK_H) $(ARTIFACT_H) $(EDOG_H) -$(O)mhitu.0: $(PCH0) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(EDOG_H) +$(O)mhitm.0: $(PCH0) $(SRC)\mhitm.c $(HACK_H) $(ARTIFACT_H) +$(O)mhitu.0: $(PCH0) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(O)mkobj.0: $(PCH0) $(SRC)\mkobj.c $(HACK_H) $(ARTIFACT_H) $(PROP_H) $(O)mkroom.0: $(PCH0) $(SRC)\mkroom.c $(HACK_H) -$(O)mon.0: $(PCH0) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) -$(O)mondata.0: $(PCH0) $(SRC)\mondata.c $(HACK_H) $(ESHK_H) $(EPRI_H) +$(O)mon.0: $(PCH0) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) +$(O)mondata.0: $(PCH0) $(SRC)\mondata.c $(HACK_H) $(O)monmove.0: $(PCH0) $(SRC)\monmove.c $(HACK_H) $(MFNDPOS_H) $(ARTIFACT_H) $(O)mthrowu.0: $(PCH0) $(SRC)\mthrowu.c $(HACK_H) $(O)objnam.0: $(PCH0) $(SRC)\objnam.c $(HACK_H) $(O)polyself.0: $(PCH0) $(SRC)\polyself.c $(HACK_H) -$(O)priest.0: $(PCH0) $(SRC)\priest.c $(HACK_H) $(MFNDPOS_H) $(ESHK_H) \ - $(EPRI_H) $(EMIN_H) +$(O)priest.0: $(PCH0) $(SRC)\priest.c $(HACK_H) $(MFNDPOS_H) $(O)rnd.0: $(PCH0) $(SRC)\rnd.c $(HACK_H) -$(O)shk.0: $(PCH0) $(SRC)\shk.c $(HACK_H) $(ESHK_H) -$(O)shknam.0: $(PCH0) $(SRC)\shknam.c $(HACK_H) $(ESHK_H) -$(O)sounds.0: $(PCH0) $(SRC)\sounds.c $(HACK_H) $(EDOG_H) +$(O)shk.0: $(PCH0) $(SRC)\shk.c $(HACK_H) +$(O)shknam.0: $(PCH0) $(SRC)\shknam.c $(HACK_H) +$(O)sounds.0: $(PCH0) $(SRC)\sounds.c $(HACK_H) $(O)steal.0: $(PCH0) $(SRC)\steal.c $(HACK_H) $(O)timeout.0: $(PCH0) $(SRC)\timeout.c $(HACK_H) $(LEV_H) $(O)track.0: $(PCH0) $(SRC)\track.c $(HACK_H) $(O)trap.0: $(PCH0) $(SRC)\trap.c $(HACK_H) -$(O)vault.0: $(PCH0) $(SRC)\vault.c $(HACK_H) $(VAULT_H) +$(O)vault.0: $(PCH0) $(SRC)\vault.c $(HACK_H) $(O)weapon.0: $(PCH0) $(SRC)\weapon.c $(HACK_H) $(O)were.0: $(PCH0) $(SRC)\were.c $(HACK_H) $(O)wizard.0: $(PCH0) $(SRC)\wizard.c $(HACK_H) $(QTEXT_H) @@ -1953,7 +1948,7 @@ $(O)zap.0: $(PCH0) $(SRC)\zap.c $(HACK_H) # $(O)allmain.1: $(PCH1) $(SRC)\allmain.c $(HACK_H) -$(O)apply.1: $(PCH1) $(SRC)\apply.c $(HACK_H) $(EDOG_H) +$(O)apply.1: $(PCH1) $(SRC)\apply.c $(HACK_H) $(O)artifact.1: $(PCH1) $(SRC)\artifact.c $(HACK_H) $(ARTIFACT_H) $(ARTILIST_H) $(O)attrib.1: $(PCH1) $(SRC)\attrib.c $(HACK_H) $(O)botl.1: $(PCH1) $(SRC)\botl.c $(HACK_H) @@ -1961,25 +1956,25 @@ $(O)cmd.1: $(PCH1) $(SRC)\cmd.c $(HACK_H) $(FUNC_TAB_H) $(O)dbridge.1: $(PCH1) $(SRC)\dbridge.c $(HACK_H) $(O)do.1: $(PCH1) $(SRC)\do.c $(HACK_H) $(LEV_H) $(O)do_wear.1: $(PCH1) $(SRC)\do_wear.c $(HACK_H) -$(O)dog.1: $(PCH1) $(SRC)\dog.c $(HACK_H) $(EDOG_H) +$(O)dog.1: $(PCH1) $(SRC)\dog.c $(HACK_H) $(O)dungeon.1: $(PCH1) $(SRC)\dungeon.c $(HACK_H) $(ALIGN_H) $(DGN_FILE_H) $(DLB_H) -$(O)eat.1: $(PCH1) $(SRC)\eat.c $(HACK_H) $(EDOG_H) +$(O)eat.1: $(PCH1) $(SRC)\eat.c $(HACK_H) $(O)engrave.1: $(PCH1) $(SRC)\engrave.c $(HACK_H) $(LEV_H) $(O)explode.1: $(PCH1) $(SRC)\explode.c $(HACK_H) $(O)hack.1: $(PCH1) $(SRC)\hack.c $(HACK_H) $(O)hacklib.1: $(PCH1) $(SRC)\hacklib.c $(HACK_H) $(O)invent.1: $(PCH1) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) -$(O)makemon.1: $(PCH1) $(SRC)\makemon.c $(HACK_H) $(EPRI_H) $(EMIN_H) -$(O)mhitu.1: $(PCH1) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(EDOG_H) +$(O)makemon.1: $(PCH1) $(SRC)\makemon.c $(HACK_H) +$(O)mhitu.1: $(PCH1) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(O)mkobj.1: $(PCH1) $(SRC)\mkobj.c $(HACK_H) $(ARTIFACT_H) $(PROP_H) -$(O)mon.1: $(PCH1) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) -$(O)mondata.1: $(PCH1) $(SRC)\mondata.c $(HACK_H) $(ESHK_H) $(EPRI_H) +$(O)mon.1: $(PCH1) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) +$(O)mondata.1: $(PCH1) $(SRC)\mondata.c $(HACK_H) $(O)monmove.1: $(PCH1) $(SRC)\monmove.c $(HACK_H) $(MFNDPOS_H) $(ARTIFACT_H) $(O)mthrowu.1: $(PCH1) $(SRC)\mthrowu.c $(HACK_H) $(O)objnam.1: $(PCH1) $(SRC)\objnam.c $(HACK_H) $(O)polyself.1: $(PCH1) $(SRC)\polyself.c $(HACK_H) $(O)rnd.1: $(PCH1) $(SRC)\rnd.c $(HACK_H) -$(O)shk.1: $(PCH1) $(SRC)\shk.c $(HACK_H) $(ESHK_H) +$(O)shk.1: $(PCH1) $(SRC)\shk.c $(HACK_H) $(O)steal.1: $(PCH1) $(SRC)\steal.c $(HACK_H) $(O)timeout.1: $(PCH1) $(SRC)\timeout.c $(HACK_H) $(LEV_H) $(O)track.1: $(PCH1) $(SRC)\track.c $(HACK_H) @@ -1995,16 +1990,16 @@ $(O)attrib.2: $(PCH2) $(SRC)\attrib.c $(HACK_H) $(O)do.2: $(PCH2) $(SRC)\do.c $(HACK_H) $(LEV_H) $(O)do_name.2: $(PCH2) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.2: $(PCH2) $(SRC)\do_wear.c $(HACK_H) -$(O)dog.2: $(PCH2) $(SRC)\dog.c $(HACK_H) $(EDOG_H) +$(O)dog.2: $(PCH2) $(SRC)\dog.c $(HACK_H) $(O)engrave.2: $(PCH2) $(SRC)\engrave.c $(HACK_H) $(LEV_H) $(O)hack.2: $(PCH2) $(SRC)\hack.c $(HACK_H) $(O)hacklib.2: $(PCH2) $(SRC)\hacklib.c $(HACK_H) $(O)invent.2: $(PCH2) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) -$(O)makemon.2: $(PCH2) $(SRC)\makemon.c $(HACK_H) $(EPRI_H) $(EMIN_H) -$(O)mon.2: $(PCH2) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) -$(O)mondata.2: $(PCH2) $(SRC)\mondata.c $(HACK_H) $(ESHK_H) $(EPRI_H) +$(O)makemon.2: $(PCH2) $(SRC)\makemon.c $(HACK_H) +$(O)mon.2: $(PCH2) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) +$(O)mondata.2: $(PCH2) $(SRC)\mondata.c $(HACK_H) $(O)monmove.2: $(PCH2) $(SRC)\monmove.c $(HACK_H) $(MFNDPOS_H) $(ARTIFACT_H) -$(O)shk.2: $(PCH2) $(SRC)\shk.c $(HACK_H) $(ESHK_H) +$(O)shk.2: $(PCH2) $(SRC)\shk.c $(HACK_H) $(O)trap.2: $(PCH2) $(SRC)\trap.c $(HACK_H) $(O)zap.2: $(PCH2) $(SRC)\zap.c $(HACK_H) @@ -2016,7 +2011,7 @@ $(O)do.3: $(PCH3) $(SRC)\do.c $(HACK_H) $(LEV_H) $(O)hack.3: $(PCH3) $(SRC)\hack.c $(HACK_H) $(O)invent.3: $(PCH3) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) $(O)light.3: $(PCH3) $(SRC)\light.c $(HACK_H) -$(O)shk.3: $(PCH3) $(SRC)\shk.c $(HACK_H) $(ESHK_H) +$(O)shk.3: $(PCH3) $(SRC)\shk.c $(HACK_H) $(O)trap.3: $(PCH3) $(SRC)\trap.c $(HACK_H) $(O)zap.3: $(PCH3) $(SRC)\zap.c $(HACK_H) @@ -2025,7 +2020,7 @@ $(O)zap.3: $(PCH3) $(SRC)\zap.c $(HACK_H) # $(O)allmain.B: $(PCHB) $(SRC)\allmain.c $(HACK_H) -$(O)apply.B: $(PCHB) $(SRC)\apply.c $(HACK_H) $(EDOG_H) +$(O)apply.B: $(PCHB) $(SRC)\apply.c $(HACK_H) $(O)artifact.B: $(PCHB) $(SRC)\artifact.c $(HACK_H) $(ARTIFACT_H) $(ARTILIST_H) $(O)attrib.B: $(PCHB) $(SRC)\attrib.c $(HACK_H) $(O)botl.B: $(PCHB) $(SRC)\botl.c $(HACK_H) @@ -2034,45 +2029,44 @@ $(O)dbridge.B: $(PCHB) $(SRC)\dbridge.c $(HACK_H) $(O)do.B: $(PCHB) $(SRC)\do.c $(HACK_H) $(LEV_H) $(O)do_name.B: $(PCHB) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.B: $(PCHB) $(SRC)\do_wear.c $(HACK_H) -$(O)dog.B: $(PCHB) $(SRC)\dog.c $(HACK_H) $(EDOG_H) -$(O)dogmove.B: $(PCHB) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) -$(O)eat.B: $(PCHB) $(SRC)\eat.c $(HACK_H) $(EDOG_H) +$(O)dog.B: $(PCHB) $(SRC)\dog.c $(HACK_H) +$(O)dogmove.B: $(PCHB) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) +$(O)eat.B: $(PCHB) $(SRC)\eat.c $(HACK_H) $(O)engrave.B: $(PCHB) $(SRC)\engrave.c $(HACK_H) $(LEV_H) $(O)hack.B: $(PCHB) $(SRC)\hack.c $(HACK_H) $(O)hacklib.B: $(PCHB) $(SRC)\hacklib.c $(HACK_H) $(O)invent.B: $(PCHB) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) $(O)lock.B: $(PCHB) $(SRC)\lock.c $(HACK_H) $(O)mail.B: $(PCHB) $(SRC)\mail.c $(HACK_H) $(MAIL_H) $(DATE_H) -$(O)makemon.B: $(PCHB) $(SRC)\makemon.c $(HACK_H) $(EPRI_H) $(EMIN_H) +$(O)makemon.B: $(PCHB) $(SRC)\makemon.c $(HACK_H) $(O)mcastu.B: $(PCHB) $(SRC)\mcastu.c $(HACK_H) -$(O)mhitm.B: $(PCHB) $(SRC)\mhitm.c $(HACK_H) $(ARTIFACT_H) $(EDOG_H) -$(O)mhitu.B: $(PCHB) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(EDOG_H) +$(O)mhitm.B: $(PCHB) $(SRC)\mhitm.c $(HACK_H) $(ARTIFACT_H) +$(O)mhitu.B: $(PCHB) $(SRC)\mhitu.c $(HACK_H) $(ARTIFACT_H) $(O)mkobj.B: $(PCHB) $(SRC)\mkobj.c $(HACK_H) $(ARTIFACT_H) $(PROP_H) $(O)mkroom.B: $(PCHB) $(SRC)\mkroom.c $(HACK_H) -$(O)mon.B: $(PCHB) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) $(EDOG_H) -$(O)mondata.B: $(PCHB) $(SRC)\mondata.c $(HACK_H) $(ESHK_H) $(EPRI_H) +$(O)mon.B: $(PCHB) $(SRC)\mon.c $(HACK_H) $(MFNDPOS_H) +$(O)mondata.B: $(PCHB) $(SRC)\mondata.c $(HACK_H) $(O)monmove.B: $(PCHB) $(SRC)\monmove.c $(HACK_H) $(MFNDPOS_H) $(ARTIFACT_H) $(O)mthrowu.B: $(PCHB) $(SRC)\mthrowu.c $(HACK_H) $(O)objnam.B: $(PCHB) $(SRC)\objnam.c $(HACK_H) -$(O)pline.B: $(SRC)\pline.c $(HACK_H) $(EPRI_H) +$(O)pline.B: $(SRC)\pline.c $(HACK_H) @type schema$(SCHEMA).bc | find "$(@B)_b" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\pline.c $(O)polyself.B: $(PCHB) $(SRC)\polyself.c $(HACK_H) $(O)potion.B: $(PCHB) $(SRC)\potion.c $(HACK_H) -$(O)priest.B: $(PCHB) $(SRC)\priest.c $(HACK_H) $(MFNDPOS_H) $(ESHK_H) \ - $(EPRI_H) $(EMIN_H) +$(O)priest.B: $(PCHB) $(SRC)\priest.c $(HACK_H) $(MFNDPOS_H) $(O)read.B: $(PCHB) $(SRC)\read.c $(HACK_H) $(O)rnd.B: $(PCHB) $(SRC)\rnd.c $(HACK_H) -$(O)shk.B: $(PCHB) $(SRC)\shk.c $(HACK_H) $(ESHK_H) -$(O)shknam.B: $(PCHB) $(SRC)\shknam.c $(HACK_H) $(ESHK_H) -$(O)sounds.B: $(PCHB) $(SRC)\sounds.c $(HACK_H) $(EDOG_H) +$(O)shk.B: $(PCHB) $(SRC)\shk.c $(HACK_H) +$(O)shknam.B: $(PCHB) $(SRC)\shknam.c $(HACK_H) +$(O)sounds.B: $(PCHB) $(SRC)\sounds.c $(HACK_H) $(O)steal.B: $(PCHB) $(SRC)\steal.c $(HACK_H) $(O)timeout.B: $(PCHB) $(SRC)\timeout.c $(HACK_H) $(LEV_H) $(O)track.B: $(PCHB) $(SRC)\track.c $(HACK_H) $(O)trap.B: $(PCHB) $(SRC)\trap.c $(HACK_H) -$(O)vault.B: $(PCHB) $(SRC)\vault.c $(HACK_H) $(VAULT_H) +$(O)vault.B: $(PCHB) $(SRC)\vault.c $(HACK_H) $(O)weapon.B: $(PCHB) $(SRC)\weapon.c $(HACK_H) $(O)were.B: $(PCHB) $(SRC)\were.c $(HACK_H) $(O)wizard.B: $(PCHB) $(SRC)\wizard.c $(HACK_H) $(QTEXT_H) diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index a6817bc65..a91a0a27e 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -1,5 +1,5 @@ # SCCS Id: @(#)Makefile.GCC 3.5 $Date$ -# Copyright (c) NetHack PC Development Team 1996-2005. +# Copyright (c) NetHack PC Development Team 1996-2006. # PC NetHack 3.5 Makefile for djgpp V2 # # Gnu gcc compiler for msdos (djgpp) @@ -358,18 +358,14 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(VVOBJ) PATCHLEV_H = $(INCL)/patchlev.h DGN_FILE_H = $(INCL)/align.h $(INCL)/dgn_file.h DUNGEON_H = $(INCL)/align.h $(INCL)/dungeon.h -EMIN_H = $(DUNGEON_H) $(INCL)/emin.h -EPRI_H = $(DUNGEON_H) $(INCL)/align.h $(INCL)/epri.h -ESHK_H = $(DUNGEON_H) $(INCL)/eshk.h MONDATA_H = $(INCL)/align.h $(INCL)/mondata.h -MONST_H = $(INCL)/align.h $(INCL)/monst.h +MONST_H = $(INCL)/align.h $(INCL)/mextra.h $(INCL)/monst.h PERMONST_H = $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/align.h \ $(INCL)/permonst.h REGION_H = $(INCL)/region.h RM_H = $(INCL)/align.h $(INCL)/rm.h SKILLS_H = $(INCL)/skills.h SP_LEV_H = $(INCL)/align.h $(INCL)/sp_lev.h -VAULT_H = $(DUNGEON_H) $(INCL)/vault.h YOUPROP_H = $(PERMONST_H) $(MONDATA_H) $(INCL)/prop.h \ $(INCL)/pm.h $(INCL)/youprop.h YOU_H = $(MONST_H) $(YOUPROP_H) $(INCL)/align.h \ @@ -870,8 +866,7 @@ $(O)drawing.o: $(CONFIG_H) drawing.c $(MSYS)/pcvideo.h $(O)decl.o: $(CONFIG_H) decl.c $(CC) $(cflags) -o$@ decl.c -$(O)monst.o: $(CONFIG_H) $(PERMONST_H) $(ESHK_H) \ - $(EPRI_H) $(VAULT_H) $(INCL)/monsym.h \ +$(O)monst.o: $(CONFIG_H) $(PERMONST_H) $(DUNGEON_H) $(INCL)/monsym.h \ $(INCL)/color.h monst.c $(CC) $(cflags) -o$@ monst.c @@ -1163,7 +1158,7 @@ $(O)monstr.o: monstr.c $(CONFIG_H) $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) -$(O)apply.o: apply.c $(HACK_H) $(INCL)/edog.h +$(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) @@ -1173,21 +1168,21 @@ $(O)cmd.o: cmd.c $(HACK_H) $(INCL)/func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)/artifact.h -$(O)dig.o: dig.c $(HACK_H) $(INCL)/edog.h +$(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h $(CC) $(cflags) -I../sys/msdos -o$@ dlb.c $(O)do.o: do.c $(HACK_H) $(INCL)/lev.h $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) -$(O)dog.o: dog.c $(HACK_H) $(INCL)/edog.h -$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/edog.h -$(O)dokick.o: dokick.c $(HACK_H) $(INCL)/eshk.h +$(O)dog.o: dog.c $(HACK_H) +$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)/mfndpos.h +$(O)dokick.o: dokick.c $(HACK_H) $(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)/tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)/dgn_file.h $(INCL)/dlb.h -$(O)eat.o: eat.c $(HACK_H) $(INCL)/edog.h -$(O)end.o: end.c $(HACK_H) $(INCL)/eshk.h $(INCL)/lev.h $(INCL)/dlb.h +$(O)eat.o: eat.c $(HACK_H) +$(O)end.o: end.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h $(O)engrave.o: engrave.c $(HACK_H) $(INCL)/lev.h $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) @@ -1200,29 +1195,26 @@ $(O)invent.o: invent.c $(HACK_H) $(O)light.o: light.c $(HACK_H) $(INCL)/lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h -$(O)makemon.o: makemon.c $(HACK_H) $(INCL)/epri.h $(INCL)/emin.h \ - $(INCL)/edog.h +$(O)makemon.o: makemon.c $(HACK_H) $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) -$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)/artifact.h $(INCL)/edog.h -$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h $(INCL)/edog.h -$(O)minion.o: minion.c $(HACK_H) $(INCL)/emin.h $(INCL)/epri.h +$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)/artifact.h +$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h +$(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) -$(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/edog.h -$(O)mondata.o: mondata.c $(HACK_H) $(INCL)/eshk.h $(INCL)/epri.h -$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h \ - $(INCL)/epri.h +$(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h +$(O)mondata.o: mondata.c $(HACK_H) +$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)/permonst.h $(INCL)/align.h \ $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \ - $(INCL)/dungeon.h $(INCL)/eshk.h $(INCL)/vault.h \ - $(INCL)/epri.h $(INCL)/color.h + $(INCL)/dungeon.h $(INCL)/color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) -$(O)muse.o: muse.c $(HACK_H) $(INCL)/edog.h +$(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) #interp.c $(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ @@ -1232,12 +1224,11 @@ $(O)options.o: options.c $(CONFIG_H) $(INCL)/objclass.h $(INCL)/flag.h \ $(HACK_H) $(INCL)/tcap.h $(O)pager.o: pager.c $(HACK_H) $(INCL)/dlb.h $(O)pickup.o: pickup.c $(HACK_H) -$(O)pline.o: pline.c $(HACK_H) $(INCL)/epri.h $(INCL)/edog.h +$(O)pline.o: pline.c $(HACK_H) $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_H) -$(O)pray.o: pray.c $(HACK_H) $(INCL)/epri.h -$(O)priest.o: priest.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/eshk.h \ - $(INCL)/epri.h $(INCL)/emin.h +$(O)pray.o: pray.c $(HACK_H) +$(O)priest.o: priest.c $(HACK_H) $(INCL)/mfndpos.h $(O)quest.o: quest.c $(HACK_H) $(INCL)/qtext.h $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(INCL)/qtext.h $(O)read.o: read.c $(HACK_H) @@ -1249,10 +1240,10 @@ $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) $(O)rumors.o: rumors.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h $(O)save.o: save.c $(HACK_H) $(INCL)/lev.h -$(O)shk.o: shk.c $(HACK_H) $(INCL)/eshk.h -$(O)shknam.o: shknam.c $(HACK_H) $(INCL)/eshk.h +$(O)shk.o: shk.c $(HACK_H) +$(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)/artifact.h -$(O)sounds.o: sounds.c $(HACK_H) $(INCL)/edog.h +$(O)sounds.o: sounds.c $(HACK_H) $(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)/dlb.h $(INCL)/sp_lev.h $(O)spell.o: spell.c $(HACK_H) $(O)steal.o: steal.c $(HACK_H) @@ -1264,14 +1255,14 @@ $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) -$(O)vault.o: vault.c $(HACK_H) $(INCL)/vault.h +$(O)vault.o: vault.c $(HACK_H) $(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(PATCHLEV_H) $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h -$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h $(INCL)/epri.h +$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h $(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) diff --git a/sys/msdos/Makefile.MSC b/sys/msdos/Makefile.MSC index a471288df..b2e75f935 100644 --- a/sys/msdos/Makefile.MSC +++ b/sys/msdos/Makefile.MSC @@ -1,5 +1,5 @@ -# SCCS Id: @(#)Makefile.MSC 3.5 2005/10/02 -# Copyright (c) NetHack PC Development Team 1997 - 2005. +# SCCS Id: @(#)Makefile.MSC 3.5 2006/01/05 +# Copyright (c) NetHack PC Development Team 1997 - 2006. # PC NetHack 3.4x Makefile for MSC V1.52c (16 bit compiler) # # For questions or comments: nethack-bugs@nethack.org @@ -241,16 +241,12 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(VVOBJ) DGN_FILE_H = $(INCL)\align.h $(INCL)\dgn_file.h DUNGEON_H = $(INCL)\align.h $(INCL)\dungeon.h -EMIN_H = $(DUNGEON_H) $(INCL)\emin.h -EPRI_H = $(DUNGEON_H) $(INCL)\align.h $(INCL)\epri.h -ESHK_H = $(DUNGEON_H) $(INCL)\eshk.h MONDATA_H = $(INCL)\align.h $(INCL)\mondata.h -MONST_H = $(INCL)\align.h $(INCL)\monst.h +MONST_H = $(INCL)\mextra.h $(INCL)\align.h $(INCL)\monst.h PERMONST_H = $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\align.h \ $(INCL)\permonst.h RM_H = $(INCL)\align.h $(INCL)\rm.h SP_LEV_H = $(INCL)\align.h $(INCL)\sp_lev.h -VAULT_H = $(DUNGEON_H) $(INCL)\vault.h YOUPROP_H = $(PERMONST_H) $(MONDATA_H) $(INCL)\prop.h \ $(INCL)\pm.h $(INCL)\youprop.h YOU_H = $(MONST_H) $(YOUPROP_H) $(INCL)\align.h \ @@ -879,8 +875,7 @@ viewtib.o: $(MSYS)\viewtib.c alloc.o: $(CONFIG_H) alloc.c drawing.o: $(CONFIG_H) drawing.c $(MSYS)\pcvideo.h decl.o: $(CONFIG_H) decl.c -monst.o: $(CONFIG_H) $(PERMONST_H) $(ESHK_H) \ - $(EPRI_H) $(VAULT_H) $(INCL)\monsym.h \ +monst.o: $(CONFIG_H) $(PERMONST_H) $(INCL)\monsym.h \ $(INCL)\color.h monst.c objects.o: $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ @@ -997,7 +992,7 @@ wintty.o: $(WIN)\wintty.c $(HACK_H) $(INCL)\dlb.h \ # src dependencies allmain.o: allmain.c $(HACK_H) alloc.o: alloc.c $(CONFIG_H) -apply.o: apply.c $(HACK_H) $(INCL)\edog.h +apply.o: apply.c $(HACK_H) artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h attrib.o: attrib.c $(HACK_H) $(INCL)\artifact.h ball.o: ball.c $(HACK_H) @@ -1007,20 +1002,20 @@ cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h dbridge.o: dbridge.c $(HACK_H) decl.o: decl.c $(HACK_H) detect.o: detect.c $(HACK_H) $(INCL)\artifact.h -dig.o: dig.c $(HACK_H) $(INCL)\edog.h +dig.o: dig.c $(HACK_H) display.o: display.c $(HACK_H) dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h do.o: do.c $(HACK_H) $(INCL)\lev.h do_name.o: do_name.c $(HACK_H) do_wear.o: do_wear.c $(HACK_H) -dog.o: dog.c $(HACK_H) $(INCL)\edog.h -dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -dokick.o: dokick.c $(HACK_H) $(INCL)\eshk.h +dog.o: dog.c $(HACK_H) +dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h +dokick.o: dokick.c $(HACK_H) dothrow.o: dothrow.c $(HACK_H) drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h eat.o: eat.c $(HACK_H) -end.o: end.c $(HACK_H) $(INCL)\eshk.h $(INCL)\lev.h $(INCL)\dlb.h +end.o: end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h engrave.o: engrave.c $(HACK_H) $(INCL)\lev.h exper.o: exper.c $(HACK_H) explode.o: explode.c $(HACK_H) @@ -1033,28 +1028,26 @@ invent.o: invent.c $(HACK_H) $(INCL)\artifact.h light.o: light.c $(HACK_H) $(INCL)\lev.h lock.o: lock.c $(HACK_H) mail.o: mail.c $(HACK_H) $(INCL)\mail.h -makemon.o: makemon.c $(HACK_H) $(INCL)\epri.h $(INCL)\emin.h \ - $(INCL)\edog.h +makemon.o: makemon.c $(HACK_H) mapglyph.o: mapglyph.c $(HACK_H) mcastu.o: mcastu.c $(HACK_H) -mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -minion.o: minion.c $(HACK_H) $(INCL)\emin.h $(INCL)\epri.h +mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h +mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h +minion.o: minion.c $(HACK_H) mklev.o: mklev.c $(HACK_H) mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h mkobj.o: mkobj.c $(HACK_H) $(INCL)\artifact.h mkroom.o: mkroom.c $(HACK_H) -mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -mondata.o: mondata.c $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h +mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h +mondata.o: mondata.c $(HACK_H) monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \ - $(INCL)\dungeon.h $(INCL)\eshk.h $(INCL)\vault.h \ - $(INCL)\epri.h $(INCL)\color.h + $(INCL)\dungeon.h $(INCL)\color.h mplayer.o: mplayer.c $(HACK_H) mthrowu.o: mthrowu.c $(HACK_H) -muse.o: muse.c $(HACK_H) $(INCL)\edog.h +muse.o: muse.c $(HACK_H) music.o: music.c $(HACK_H) #interp.c o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ @@ -1065,12 +1058,11 @@ options.o: options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \ pager.o: pager.c $(HACK_H) $(INCL)\dlb.h @$(CC) $(CFLAGS) $(SPECOPTS) /f- /Od /Fo$@ pager.c pickup.o: pickup.c $(HACK_H) -pline.o: pline.c $(HACK_H) $(INCL)\epri.h +pline.o: pline.c $(HACK_H) polyself.o: polyself.c $(HACK_H) potion.o: potion.c $(HACK_H) -pray.o: pray.c $(HACK_H) $(INCL)\epri.h -priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\eshk.h \ - $(INCL)\epri.h $(INCL)\emin.h +pray.o: pray.c $(HACK_H) +priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h quest.o: quest.c $(HACK_H) $(INCL)\qtext.h questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h $(INCL)\qtext.h read.o: read.c $(HACK_H) @@ -1082,10 +1074,10 @@ rnd.o: rnd.c $(HACK_H) role.o: role.c $(HACK_H) rumors.o: rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h save.o: save.c $(HACK_H) $(INCL)\lev.h -shk.o: shk.c $(HACK_H) $(INCL)\eshk.h -shknam.o: shknam.c $(HACK_H) $(INCL)\eshk.h +shk.o: shk.c $(HACK_H) +shknam.o: shknam.c $(HACK_H) sit.o: sit.c $(HACK_H) $(INCL)\artifact.h -sounds.o: sounds.c $(HACK_H) $(INCL)\edog.h +sounds.o: sounds.c $(HACK_H) sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\dlb.h $(INCL)\sp_lev.h spell.o: spell.c $(HACK_H) steal.o: steal.c $(HACK_H) @@ -1097,7 +1089,7 @@ track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) u_init.o: u_init.c $(HACK_H) uhitm.o: uhitm.c $(HACK_H) -vault.o: vault.c $(HACK_H) $(INCL)\vault.h +vault.o: vault.c $(HACK_H) version.o: version.c $(HACK_H) $(INCL)\date.h $(INCL)\patchlev.h vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h weapon.o: weapon.c $(HACK_H) diff --git a/sys/os2/Makefile.os2 b/sys/os2/Makefile.os2 index 4720dc22c..f07c072b6 100644 --- a/sys/os2/Makefile.os2 +++ b/sys/os2/Makefile.os2 @@ -1,4 +1,4 @@ -# SCCS Id: @(#)Makefile.os2 3.5 1996/10/29 +# SCCS Id: @(#)Makefile.os2 3.5 2006/01/05 # OS/2 NetHack 3.5 Makefile for OS/2 versions 1.x and 2.x # Copyright (C) 1990, 1991, 1992, 1993, 1996 Timo Hakulinen # @@ -709,7 +709,7 @@ OS2CONF_H = $(INCL)\os2conf.h $(INCL)\micro.h $(INCL)\system.h $(EXTERN_H) GLOBAL_H = $(INCL)\global.h $(INCL)\coord.h $(OS2CONF_H) CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h $(GLOBAL_H) TRAP_H = $(INCL)\trap.h -PERMONST_H = $(INCL)\permonst.h $(INCL)\monattk.h $(INCL)\monflag.h +PERMONST_H = $(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h $(INCL)\monflag.h YOU_H = $(INCL)\you.h $(INCL)\attrib.h $(PERMONST_H) $(INCL)\mondata.h \ $(INCL)\monst.h $(INCL)\youprop.h $(INCL)\prop.h $(INCL)\pm.h DECL_H = $(INCL)\decl.h $(INCL)\spell.h $(INCL)\obj.h $(YOU_H) \ @@ -1504,7 +1504,7 @@ $(OBJ)\allmain.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\alloc.o : $(SRC)\$(CB) $(CONFIG_H) $(SRCCC) -$(OBJ)\apply.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\edog.h +$(OBJ)\apply.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\artifact.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(SRCCC) @@ -1536,11 +1536,11 @@ $(OBJ)\do_name.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\do_wear.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\dog.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\edog.h +$(OBJ)\dog.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\dogmove.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h +$(OBJ)\dogmove.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(SRCCC) -$(OBJ)\dokick.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\eshk.h +$(OBJ)\dokick.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\dothrow.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1550,7 +1550,7 @@ $(OBJ)\dungeon.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\dgn_file.h $(SRCCC) $(OBJ)\eat.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\end.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\eshk.h $(INCL)\lev.h +$(OBJ)\end.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(SRCCC) $(OBJ)\engrave.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(SRCCC) @@ -1576,17 +1576,17 @@ $(OBJ)\lock.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\mail.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mail.h $(SRCCC) -$(OBJ)\makemon.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\epri.h $(INCL)\emin.h +$(OBJ)\makemon.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\mapglyph.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\mcastu.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\mhitm.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h +$(OBJ)\mhitm.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(SRCCC) -$(OBJ)\mhitu.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h +$(OBJ)\mhitu.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(SRCCC) -$(OBJ)\minion.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\emin.h $(INCL)\epri.h +$(OBJ)\minion.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\mklev.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1598,19 +1598,19 @@ $(OBJ)\mkobj.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(SRCCC) $(OBJ)\mkroom.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\mon.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h +$(OBJ)\mon.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(SRCCC) -$(OBJ)\mondata.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h +$(OBJ)\mondata.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\monmove.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h $(SRCCC) -$(OBJ)\monst.o : $(SRC)\$(CB) $(CONFIG_H) $(PERMONST_H) $(INCL)\monsym.h $(INCL)\eshk.h $(INCL)\vault.h $(INCL)\epri.h $(INCL)\color.h +$(OBJ)\monst.o : $(SRC)\$(CB) $(CONFIG_H) $(PERMONST_H) $(INCL)\monsym.h $(INCL)\color.h $(SRCCC) $(OBJ)\mplayer.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\mthrowu.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\muse.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\edog.h +$(OBJ)\muse.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\music.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1626,15 +1626,15 @@ $(OBJ)\pager.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\pickup.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\pline.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\epri.h +$(OBJ)\pline.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\polyself.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\potion.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\pray.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\epri.h +$(OBJ)\pray.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\priest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(INCL)\eshk.h $(INCL)\epri.h $(INCL)\emin.h +$(OBJ)\priest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(SRCCC) $(OBJ)\quest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\quest.h $(INCL)\qtext.h $(SRCCC) @@ -1658,13 +1658,13 @@ $(OBJ)\rumors.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\save.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(INCL)\quest.h $(SRCCC) -$(OBJ)\shk.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\eshk.h +$(OBJ)\shk.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\shknam.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\eshk.h +$(OBJ)\shknam.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\sit.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(SRCCC) -$(OBJ)\sounds.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\edog.h $(INCL)\eshk.h +$(OBJ)\sounds.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\sp_lev.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\sp_lev.h $(INCL)\rect.h $(SRCCC) @@ -1688,7 +1688,7 @@ $(OBJ)\u_init.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\uhitm.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\vault.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\vault.h +$(OBJ)\vault.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\version.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\date.h $(INCL)\$(PATCHLEV).h $(SRCCC) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 427256428..7faaa6199 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile. -# SCCS Id: @(#)Makefile.src 3.5 2002/03/02 +# SCCS Id: @(#)Makefile.src 3.5 2006/01/05 # newer makes predefine $(MAKE) to 'make' and do smarter processing of # recursive make calls if $(MAKE) is used @@ -358,12 +358,12 @@ CSOURCES = $(HACKCSRC) $(SYSSRC) $(WINCSRC) $(GENCSRC) # HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \ config.h config1.h context.h coord.h decl.h def_os2.h display.h dlb.h \ - dungeon.h edog.h emin.h engrave.h epri.h eshk.h extern.h flag.h \ - func_tab.h global.h hack.h lev.h macconf.h mfndpos.h micro.h mkroom.h \ + dungeon.h engrave.h extern.h flag.h func_tab.h global.h hack.h lev.h \ + macconf.h mextra.h mfndpos.h micro.h mkroom.h \ monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \ os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h region.h rm.h \ sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h tradstdc.h \ - trampoli.h trap.h unixconf.h vault.h vision.h vmsconf.h wintty.h \ + trampoli.h trap.h unixconf.h vision.h vmsconf.h wintty.h \ winX.h winprocs.h wintype.h you.h youprop.h HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h\ @@ -700,7 +700,7 @@ monstr.o: monstr.c $(CONFIG_H) vis_tab.o: vis_tab.c $(CONFIG_H) ../include/vis_tab.h allmain.o: allmain.c $(HACK_H) alloc.o: alloc.c $(CONFIG_H) -apply.o: apply.c $(HACK_H) ../include/edog.h +apply.o: apply.c $(HACK_H) artifact.o: artifact.c $(HACK_H) ../include/artifact.h ../include/artilist.h attrib.o: attrib.c $(HACK_H) ball.o: ball.c $(HACK_H) @@ -710,20 +710,20 @@ cmd.o: cmd.c $(HACK_H) ../include/func_tab.h dbridge.o: dbridge.c $(HACK_H) decl.o: decl.c $(HACK_H) detect.o: detect.c $(HACK_H) ../include/artifact.h -dig.o: dig.c $(HACK_H) ../include/edog.h +dig.o: dig.c $(HACK_H) display.o: display.c $(HACK_H) dlb.o: dlb.c $(CONFIG_H) ../include/dlb.h do.o: do.c $(HACK_H) ../include/lev.h do_name.o: do_name.c $(HACK_H) do_wear.o: do_wear.c $(HACK_H) -dog.o: dog.c $(HACK_H) ../include/edog.h -dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h ../include/edog.h -dokick.o: dokick.c $(HACK_H) ../include/eshk.h -dothrow.o: dothrow.c $(HACK_H) ../include/edog.h +dog.o: dog.c $(HACK_H) +dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h +dokick.o: dokick.c $(HACK_H) +dothrow.o: dothrow.c $(HACK_H) drawing.o: drawing.c $(HACK_H) ../include/tcap.h dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h eat.o: eat.c $(HACK_H) -end.o: end.c $(HACK_H) ../include/eshk.h ../include/lev.h ../include/dlb.h +end.o: end.c $(HACK_H) ../include/lev.h ../include/dlb.h engrave.o: engrave.c $(HACK_H) ../include/lev.h exper.o: exper.c $(HACK_H) explode.o: explode.c $(HACK_H) @@ -736,29 +736,26 @@ invent.o: invent.c $(HACK_H) light.o: light.c $(HACK_H) ../include/lev.h lock.o: lock.c $(HACK_H) mail.o: mail.c $(HACK_H) ../include/mail.h -makemon.o: makemon.c $(HACK_H) ../include/epri.h ../include/emin.h \ - ../include/edog.h +makemon.o: makemon.c $(HACK_H) mapglyph.o: mapglyph.c $(HACK_H) mcastu.o: mcastu.c $(HACK_H) -mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h ../include/edog.h -mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h ../include/edog.h -minion.o: minion.c $(HACK_H) ../include/emin.h ../include/epri.h +mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h +mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h +minion.o: minion.c $(HACK_H) mklev.o: mklev.c $(HACK_H) mkmap.o: mkmap.c $(HACK_H) ../include/sp_lev.h mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h ../include/lev.h mkobj.o: mkobj.c $(HACK_H) mkroom.o: mkroom.c $(HACK_H) -mon.o: mon.c $(HACK_H) ../include/mfndpos.h ../include/edog.h -mondata.o: mondata.c $(HACK_H) ../include/eshk.h ../include/epri.h -monmove.o: monmove.c $(HACK_H) ../include/mfndpos.h ../include/artifact.h \ - ../include/epri.h +mon.o: mon.c $(HACK_H) ../include/mfndpos.h +mondata.o: mondata.c $(HACK_H) +monmove.o: monmove.c $(HACK_H) ../include/mfndpos.h ../include/artifact.h monst.o: monst.c $(CONFIG_H) ../include/permonst.h ../include/align.h \ ../include/monattk.h ../include/monflag.h ../include/monsym.h \ - ../include/dungeon.h ../include/eshk.h ../include/vault.h \ - ../include/epri.h ../include/color.h + ../include/dungeon.h ../include/color.h mplayer.o: mplayer.c $(HACK_H) mthrowu.o: mthrowu.c $(HACK_H) -muse.o: muse.c $(HACK_H) ../include/edog.h +muse.o: muse.c $(HACK_H) music.o: music.c $(HACK_H) #interp.c o_init.o: o_init.c $(HACK_H) ../include/lev.h objects.o: objects.c $(CONFIG_H) ../include/obj.h ../include/objclass.h \ @@ -768,12 +765,11 @@ options.o: options.c $(CONFIG_H) ../include/objclass.h ../include/flag.h \ $(HACK_H) ../include/tcap.h pager.o: pager.c $(HACK_H) ../include/dlb.h pickup.o: pickup.c $(HACK_H) -pline.o: pline.c $(HACK_H) ../include/epri.h ../include/edog.h +pline.o: pline.c $(HACK_H) polyself.o: polyself.c $(HACK_H) potion.o: potion.c $(HACK_H) -pray.o: pray.c $(HACK_H) ../include/epri.h -priest.o: priest.c $(HACK_H) ../include/mfndpos.h ../include/eshk.h \ - ../include/epri.h ../include/emin.h +pray.o: pray.c $(HACK_H) +priest.o: priest.c $(HACK_H) ../include/mfndpos.h quest.o: quest.c $(HACK_H) ../include/qtext.h questpgr.o: questpgr.c $(HACK_H) ../include/dlb.h ../include/qtext.h read.o: read.c $(HACK_H) @@ -785,10 +781,10 @@ rnd.o: rnd.c $(HACK_H) role.o: role.c $(HACK_H) rumors.o: rumors.c $(HACK_H) ../include/lev.h ../include/dlb.h save.o: save.c $(HACK_H) ../include/lev.h -shk.o: shk.c $(HACK_H) ../include/eshk.h -shknam.o: shknam.c $(HACK_H) ../include/eshk.h +shk.o: shk.c $(HACK_H) +shknam.o: shknam.c $(HACK_H) sit.o: sit.c $(HACK_H) ../include/artifact.h -sounds.o: sounds.c $(HACK_H) ../include/edog.h +sounds.o: sounds.c $(HACK_H) sp_lev.o: sp_lev.c $(HACK_H) ../include/dlb.h ../include/sp_lev.h spell.o: spell.c $(HACK_H) steal.o: steal.c $(HACK_H) @@ -800,14 +796,14 @@ track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) u_init.o: u_init.c $(HACK_H) uhitm.o: uhitm.c $(HACK_H) -vault.o: vault.c $(HACK_H) ../include/vault.h +vault.o: vault.c $(HACK_H) version.o: version.c $(HACK_H) ../include/date.h ../include/patchlevel.h vision.o: vision.c $(HACK_H) ../include/vis_tab.h weapon.o: weapon.c $(HACK_H) were.o: were.c $(HACK_H) wield.o: wield.c $(HACK_H) windows.o: windows.c $(HACK_H) ../include/wingem.h ../include/winGnome.h -wizard.o: wizard.c $(HACK_H) ../include/qtext.h ../include/epri.h +wizard.o: wizard.c $(HACK_H) ../include/qtext.h worm.o: worm.c $(HACK_H) ../include/lev.h worn.o: worn.c $(HACK_H) write.o: write.c $(HACK_H) diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index 98199374e..2176d980e 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile (VMS) - for building nethack itself. -# SCCS Id: @(#)Makefile.src 3.5 2005/12/14 +# SCCS Id: @(#)Makefile.src 3.5 2006/01/05 # Copy this file to [.src]Makefile. and then edit it as needed. # The default configuration is for building with DEC C (aka Compaq C). @@ -127,12 +127,12 @@ VERSOURCES = $(HACKCSRC) $(SYSSRC) $(WINSRC) $(RANDSRC) $(GENCSRC) # HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \ config.h config1.h context.h coord.h decl.h def_os2.h display.h \ - dlb.h dungeon.h edog.h emin.h engrave.h epri.h eshk.h extern.h \ - flag.h func_tab.h global.h hack.h lev.h macconf.h mfndpos.h micro.h \ + dlb.h dungeon.h engrave.h extern.h flag.h func_tab.h global.h \ + hack.h lev.h macconf.h mextra.h mfndpos.h micro.h \ mkroom.h monattk.h mondata.h monflag.h monst.h monsym.h obj.h \ objclass.h os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h \ region.h rm.h sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h \ - tradstdc.h trampoli.h trap.h unixconf.h vault.h vision.h vmsconf.h \ + tradstdc.h trampoli.h trap.h unixconf.h vision.h vmsconf.h \ wintty.h winX.h winprocs.h wintype.h you.h youprop.h #HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h\ @@ -349,7 +349,7 @@ vis_tab.obj : vis_tab.c $(CONFIG_H) $(INC)vis_tab.h # general code allmain.obj : allmain.c $(HACK_H) alloc.obj : alloc.c $(CONFIG_H) -apply.obj : apply.c $(HACK_H) $(INC)edog.h +apply.obj : apply.c $(HACK_H) artifact.obj : artifact.c $(HACK_H) $(INC)artifact.h $(INC)artilist.h attrib.obj : attrib.c $(HACK_H) ball.obj : ball.c $(HACK_H) @@ -359,20 +359,20 @@ cmd.obj : cmd.c $(HACK_H) $(INC)func_tab.h dbridge.obj : dbridge.c $(HACK_H) decl.obj : decl.c $(HACK_H) detect.obj : detect.c $(HACK_H) $(INC)artifact.h -dig.obj : dig.c $(HACK_H) $(INC)edog.h +dig.obj : dig.c $(HACK_H) display.obj : display.c $(HACK_H) dlb.obj : dlb.c $(CONFIG_H) $(INC)dlb.h do.obj : do.c $(HACK_H) $(INC)lev.h do_name.obj : do_name.c $(HACK_H) do_wear.obj : do_wear.c $(HACK_H) -dog.obj : dog.c $(HACK_H) $(INC)edog.h -dogmove.obj : dogmove.c $(HACK_H) $(INC)mfndpos.h $(INC)edog.h -dokick.obj : dokick.c $(HACK_H) $(INC)eshk.h -dothrow.obj : dothrow.c $(HACK_H) $(INC)edog.h +dog.obj : dog.c $(HACK_H) +dogmove.obj : dogmove.c $(HACK_H) $(INC)mfndpos.h +dokick.obj : dokick.c $(HACK_H) +dothrow.obj : dothrow.c $(HACK_H) drawing.obj : drawing.c $(HACK_H) $(INC)tcap.h dungeon.obj : dungeon.c $(HACK_H) $(INC)dgn_file.h $(INC)dlb.h -eat.obj : eat.c $(HACK_H) $(INC)edog.h -end.obj : end.c $(HACK_H) $(INC)eshk.h $(INC)lev.h $(INC)dlb.h +eat.obj : eat.c $(HACK_H) +end.obj : end.c $(HACK_H) $(INC)lev.h $(INC)dlb.h engrave.obj : engrave.c $(HACK_H) $(INC)lev.h exper.obj : exper.c $(HACK_H) explode.obj : explode.c $(HACK_H) @@ -385,27 +385,26 @@ invent.obj : invent.c $(HACK_H) light.obj : light.c $(HACK_H) $(INC)lev.h lock.obj : lock.c $(HACK_H) mail.obj : mail.c $(HACK_H) $(INC)mail.h -makemon.obj : makemon.c $(HACK_H) $(INC)epri.h $(INC)emin.h $(INC)edog.h +makemon.obj : makemon.c $(HACK_H) mapglyph.obj : mapglyph.c $(HACK_H) $(INC)wintty.h $(INC)color.h mcastu.obj : mcastu.c $(HACK_H) -mhitm.obj : mhitm.c $(HACK_H) $(INC)artifact.h $(INC)edog.h -mhitu.obj : mhitu.c $(HACK_H) $(INC)artifact.h $(INC)edog.h -minion.obj : minion.c $(HACK_H) $(INC)emin.h $(INC)epri.h +mhitm.obj : mhitm.c $(HACK_H) $(INC)artifact.h +mhitu.obj : mhitu.c $(HACK_H) $(INC)artifact.h +minion.obj : minion.c $(HACK_H) mklev.obj : mklev.c $(HACK_H) mkmap.obj : mkmap.c $(HACK_H) $(INC)sp_lev.h mkmaze.obj : mkmaze.c $(HACK_H) $(INC)sp_lev.h $(INC)lev.h mkobj.obj : mkobj.c $(HACK_H) mkroom.obj : mkroom.c $(HACK_H) -mon.obj : mon.c $(HACK_H) $(INC)mfndpos.h $(INC)edog.h +mon.obj : mon.c $(HACK_H) $(INC)mfndpos.h mondata.obj : mondata.c $(HACK_H) monmove.obj : monmove.c $(HACK_H) $(INC)mfndpos.h $(INC)artifact.h monst.obj : monst.c $(CONFIG_H) $(INC)permonst.h $(INC)align.h \ $(INC)monattk.h $(INC)monflag.h $(INC)monsym.h \ - $(INC)dungeon.h $(INC)eshk.h $(INC)vault.h \ - $(INC)epri.h $(INC)emin.h $(INC)color.h + $(INC)dungeon.h $(INC)color.h mplayer.obj : mplayer.c $(HACK_H) mthrowu.obj : mthrowu.c $(HACK_H) -muse.obj : muse.c $(HACK_H) $(INC)edog.h +muse.obj : muse.c $(HACK_H) music.obj : music.c $(HACK_H) #interp.c o_init.obj : o_init.c $(HACK_H) $(INC)lev.h objects.obj : objects.c $(CONFIG_H) $(INC)obj.h $(INC)objclass.h \ @@ -415,12 +414,11 @@ options.obj : options.c $(CONFIG_H) $(INC)objclass.h $(INC)flag.h \ $(HACK_H) $(INC)tcap.h pager.obj : pager.c $(HACK_H) $(INC)dlb.h pickup.obj : pickup.c $(HACK_H) -pline.obj : pline.c $(HACK_H) $(INC)edog.h +pline.obj : pline.c $(HACK_H) polyself.obj : polyself.c $(HACK_H) potion.obj : potion.c $(HACK_H) -pray.obj : pray.c $(HACK_H) $(INC)epri.h -priest.obj : priest.c $(HACK_H) $(INC)mfndpos.h $(INC)eshk.h \ - $(INC)epri.h $(INC)emin.h +pray.obj : pray.c $(HACK_H) +priest.obj : priest.c $(HACK_H) $(INC)mfndpos.h quest.obj : quest.c $(HACK_H) $(INC)qtext.h questpgr.obj : questpgr.c $(HACK_H) $(INC)dlb.h $(INC)qtext.h read.obj : read.c $(HACK_H) @@ -432,10 +430,10 @@ rnd.obj : rnd.c $(HACK_H) role.obj : role.c $(HACK_H) rumors.obj : rumors.c $(HACK_H) $(INC)lev.h $(INC)dlb.h save.obj : save.c $(HACK_H) $(INC)lev.h -shk.obj : shk.c $(HACK_H) $(INC)eshk.h -shknam.obj : shknam.c $(HACK_H) $(INC)eshk.h +shk.obj : shk.c $(HACK_H) +shknam.obj : shknam.c $(HACK_H) sit.obj : sit.c $(HACK_H) $(INC)artifact.h -sounds.obj : sounds.c $(HACK_H) $(INC)edog.h +sounds.obj : sounds.c $(HACK_H) sp_lev.obj : sp_lev.c $(HACK_H) $(INC)dlb.h $(INC)sp_lev.h spell.obj : spell.c $(HACK_H) steal.obj : steal.c $(HACK_H) @@ -447,7 +445,7 @@ track.obj : track.c $(HACK_H) trap.obj : trap.c $(HACK_H) u_init.obj : u_init.c $(HACK_H) uhitm.obj : uhitm.c $(HACK_H) -vault.obj : vault.c $(HACK_H) $(INC)vault.h +vault.obj : vault.c $(HACK_H) version.obj : version.c $(HACK_H) $(INC)date.h $(INC)patchlevel.h vision.obj : vision.c $(HACK_H) $(INC)vis_tab.h weapon.obj : weapon.c $(HACK_H) diff --git a/sys/wince/bootstrp.mak b/sys/wince/bootstrp.mak index 510a2108d..3c21e75d6 100644 --- a/sys/wince/bootstrp.mak +++ b/sys/wince/bootstrp.mak @@ -1,4 +1,4 @@ -# SCCS Id: @(#)bootstrp.mak 3.5 2002/03/24 +# SCCS Id: @(#)bootstrp.mak 3.5 2006/01/05 # Copyright (c) Michael Allison # # NetHack Windows CE bootstrap file for MS Visual C++ V6.x and @@ -191,7 +191,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ $(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \ - $(INCL)\permonst.h $(INCL)\monattk.h \ + $(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h \ $(INCL)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \ $(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \ $(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \ @@ -766,7 +766,7 @@ $(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H) $(O)vis_tab.o: $(SRC)\vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)allmain.o: $(SRC)\allmain.c $(HACK_H) $(O)alloc.o: $(SRC)\alloc.c $(CONFIG_H) -$(O)apply.o: $(SRC)\apply.c $(HACK_H) $(INCL)\edog.h +$(O)apply.o: $(SRC)\apply.c $(HACK_H) $(O)artifact.o: $(SRC)\artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(O)attrib.o: $(SRC)\attrib.c $(HACK_H) $(INCL)\artifact.h $(O)ball.o: $(SRC)\ball.c $(HACK_H) @@ -776,20 +776,20 @@ $(O)cmd.o: $(SRC)\cmd.c $(HACK_H) $(INCL)\func_tab.h $(O)dbridge.o: $(SRC)\dbridge.c $(HACK_H) $(O)decl.o: $(SRC)\decl.c $(HACK_H) $(O)detect.o: $(SRC)\detect.c $(HACK_H) $(INCL)\artifact.h -$(O)dig.o: $(SRC)\dig.c $(HACK_H) $(INCL)\edog.h +$(O)dig.o: $(SRC)\dig.c $(HACK_H) $(O)display.o: $(SRC)\display.c $(HACK_H) $(O)dlb.o: $(SRC)\dlb.c $(CONFIG_H) $(INCL)\dlb.h $(O)do.o: $(SRC)\do.c $(HACK_H) $(INCL)\lev.h $(O)do_name.o: $(SRC)\do_name.c $(HACK_H) $(O)do_wear.o: $(SRC)\do_wear.c $(HACK_H) -$(O)dog.o: $(SRC)\dog.c $(HACK_H) $(INCL)\edog.h -$(O)dogmove.o: $(SRC)\dogmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)dokick.o: $(SRC)\dokick.c $(HACK_H) $(INCL)\eshk.h +$(O)dog.o: $(SRC)\dog.c $(HACK_H) +$(O)dogmove.o: $(SRC)\dogmove.c $(HACK_H) $(INCL)\mfndpos.h +$(O)dokick.o: $(SRC)\dokick.c $(HACK_H) $(O)dothrow.o: $(SRC)\dothrow.c $(HACK_H) $(O)drawing.o: $(SRC)\drawing.c $(HACK_H) $(INCL)\tcap.h $(O)dungeon.o: $(SRC)\dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h -$(O)eat.o: $(SRC)\eat.c $(HACK_H) $(INCL)\edog.h -$(O)end.o: $(SRC)\end.c $(HACK_H) $(INCL)\eshk.h $(INCL)\lev.h $(INCL)\dlb.h +$(O)eat.o: $(SRC)\eat.c $(HACK_H) +$(O)end.o: $(SRC)\end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)engrave.o: $(SRC)\engrave.c $(HACK_H) $(INCL)\lev.h $(O)exper.o: $(SRC)\exper.c $(HACK_H) $(O)explode.o: $(SRC)\explode.c $(HACK_H) @@ -802,28 +802,26 @@ $(O)invent.o: $(SRC)\invent.c $(HACK_H) $(INCL)\artifact.h $(O)light.o: $(SRC)\light.c $(HACK_H) $(INCL)\lev.h $(O)lock.o: $(SRC)\lock.c $(HACK_H) $(O)mail.o: $(SRC)\mail.c $(HACK_H) $(INCL)\mail.h -$(O)makemon.o: $(SRC)\makemon.c $(HACK_H) $(INCL)\epri.h $(INCL)\emin.h \ - $(INCL)\edog.h +$(O)makemon.o: $(SRC)\makemon.c $(HACK_H) $(O)mapglyph.o: $(SRC)\mapglyph.c $(HACK_H) $(O)mcastu.o: $(SRC)\mcastu.c $(HACK_H) -$(O)mhitm.o: $(SRC)\mhitm.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)mhitu.o: $(SRC)\mhitu.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)minion.o: $(SRC)\minion.c $(HACK_H) $(INCL)\emin.h $(INCL)\epri.h +$(O)mhitm.o: $(SRC)\mhitm.c $(HACK_H) $(INCL)\artifact.h +$(O)mhitu.o: $(SRC)\mhitu.c $(HACK_H) $(INCL)\artifact.h +$(O)minion.o: $(SRC)\minion.c $(HACK_H) $(O)mklev.o: $(SRC)\mklev.c $(HACK_H) $(O)mkmap.o: $(SRC)\mkmap.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkmaze.o: $(SRC)\mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h $(O)mkobj.o: $(SRC)\mkobj.c $(HACK_H) $(INCL)\artifact.h $(O)mkroom.o: $(SRC)\mkroom.c $(HACK_H) -$(O)mon.o: $(SRC)\mon.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)mondata.o: $(SRC)\mondata.c $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h +$(O)mon.o: $(SRC)\mon.c $(HACK_H) $(INCL)\mfndpos.h +$(O)mondata.o: $(SRC)\mondata.c $(HACK_H) $(O)monmove.o: $(SRC)\monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h $(O)monst.o: $(SRC)\monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \ - $(INCL)\dungeon.h $(INCL)\eshk.h $(INCL)\vault.h \ - $(INCL)\epri.h $(INCL)\color.h + $(INCL)\dungeon.h $(INCL)\color.h $(O)mplayer.o: $(SRC)\mplayer.c $(HACK_H) $(O)mthrowu.o: $(SRC)\mthrowu.c $(HACK_H) -$(O)muse.o: $(SRC)\muse.c $(HACK_H) $(INCL)\edog.h +$(O)muse.o: $(SRC)\muse.c $(HACK_H) $(O)music.o: $(SRC)\music.c $(HACK_H) #interp.c $(O)o_init.o: $(SRC)\o_init.c $(HACK_H) $(INCL)\lev.h $(O)objects.o: $(SRC)\objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ @@ -833,12 +831,11 @@ $(O)options.o: $(SRC)\options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \ $(HACK_H) $(INCL)\tcap.h $(O)pager.o: $(SRC)\pager.c $(HACK_H) $(INCL)\dlb.h $(O)pickup.o: $(SRC)\pickup.c $(HACK_H) -$(O)pline.o: $(SRC)\pline.c $(HACK_H) $(INCL)\epri.h $(INCL)\edog.h +$(O)pline.o: $(SRC)\pline.c $(HACK_H) $(O)polyself.o: $(SRC)\polyself.c $(HACK_H) $(O)potion.o: $(SRC)\potion.c $(HACK_H) -$(O)pray.o: $(SRC)\pray.c $(HACK_H) $(INCL)\epri.h -$(O)priest.o: $(SRC)\priest.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\eshk.h \ - $(INCL)\epri.h $(INCL)\emin.h +$(O)pray.o: $(SRC)\pray.c $(HACK_H) +$(O)priest.o: $(SRC)\priest.c $(HACK_H) $(INCL)\mfndpos.h $(O)quest.o: $(SRC)\quest.c $(HACK_H) $(INCL)\qtext.h $(O)questpgr.o: $(SRC)\questpgr.c $(HACK_H) $(INCL)\dlb.h $(INCL)\qtext.h $(O)read.o: $(SRC)\read.c $(HACK_H) @@ -850,10 +847,10 @@ $(O)rnd.o: $(SRC)\rnd.c $(HACK_H) $(O)role.o: $(SRC)\role.c $(HACK_H) $(O)rumors.o: $(SRC)\rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)save.o: $(SRC)\save.c $(HACK_H) $(INCL)\lev.h -$(O)shk.o: $(SRC)\shk.c $(HACK_H) $(INCL)\eshk.h -$(O)shknam.o: $(SRC)\shknam.c $(HACK_H) $(INCL)\eshk.h +$(O)shk.o: $(SRC)\shk.c $(HACK_H) +$(O)shknam.o: $(SRC)\shknam.c $(HACK_H) $(O)sit.o: $(SRC)\sit.c $(HACK_H) $(INCL)\artifact.h -$(O)sounds.o: $(SRC)\sounds.c $(HACK_H) $(INCL)\edog.h +$(O)sounds.o: $(SRC)\sounds.c $(HACK_H) $(O)sp_lev.o: $(SRC)\sp_lev.c $(HACK_H) $(INCL)\dlb.h $(INCL)\sp_lev.h $(O)spell.o: $(SRC)\spell.c $(HACK_H) $(O)steal.o: $(SRC)\steal.c $(HACK_H) @@ -865,7 +862,7 @@ $(O)track.o: $(SRC)\track.c $(HACK_H) $(O)trap.o: $(SRC)\trap.c $(HACK_H) $(O)u_init.o: $(SRC)\u_init.c $(HACK_H) $(O)uhitm.o: $(SRC)\uhitm.c $(HACK_H) -$(O)vault.o: $(SRC)\vault.c $(HACK_H) $(INCL)\vault.h +$(O)vault.o: $(SRC)\vault.c $(HACK_H) $(O)version.o: $(SRC)\version.c $(HACK_H) $(INCL)\date.h $(INCL)\patchlevel.h $(O)vision.o: $(SRC)\vision.c $(HACK_H) $(INCL)\vis_tab.h $(O)weapon.o: $(SRC)\weapon.c $(HACK_H) diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc index 67cfb00fe..4177e72d3 100644 --- a/sys/winnt/Makefile.bcc +++ b/sys/winnt/Makefile.bcc @@ -1,5 +1,5 @@ # SCCS Id: @(#)Makefile.bcc 3.5 $Date$ -# Copyright (c) NetHack PC Development Team 1993-2005 +# Copyright (c) NetHack PC Development Team 1993-2006 # # # IMPORTANT NOTE: This Makefile has not been tested for 3.5.x. @@ -475,7 +475,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\context.h $(INCL)\align.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ $(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \ - $(INCL)\permonst.h $(INCL)\monattk.h \ + $(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h \ $(INCL)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \ $(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \ $(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \ @@ -1262,7 +1262,7 @@ $(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H) $(O)vis_tab.o: $(SRC)\vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) -$(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h +$(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(INCL)\artifact.h $(O)ball.o: ball.c $(HACK_H) @@ -1272,20 +1272,20 @@ $(O)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h -$(O)dig.o: dig.c $(HACK_H) $(INCL)\edog.h +$(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(O)do.o: do.c $(HACK_H) $(INCL)\lev.h $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) -$(O)dog.o: dog.c $(HACK_H) $(INCL)\edog.h -$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)dokick.o: dokick.c $(HACK_H) $(INCL)\eshk.h -$(O)dothrow.o: dothrow.c $(HACK_H) $(INCL)\edog.h +$(O)dog.o: dog.c $(HACK_H) +$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h +$(O)dokick.o: dokick.c $(HACK_H) +$(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h -$(O)eat.o: eat.c $(HACK_H) $(INCL)\edog.h -$(O)end.o: end.c $(HACK_H) $(INCL)\eshk.h $(INCL)\lev.h $(INCL)\dlb.h +$(O)eat.o: eat.c $(HACK_H) +$(O)end.o: end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)engrave.o: engrave.c $(HACK_H) $(INCL)\lev.h $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) @@ -1298,28 +1298,26 @@ $(O)invent.o: invent.c $(HACK_H) $(INCL)\artifact.h $(O)light.o: light.c $(HACK_H) $(INCL)\lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)\mail.h -$(O)makemon.o: makemon.c $(HACK_H) $(INCL)\epri.h $(INCL)\emin.h \ - $(INCL)\edog.h +$(O)makemon.o: makemon.c $(HACK_H) $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) -$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)minion.o: minion.c $(HACK_H) $(INCL)\emin.h $(INCL)\epri.h +$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h +$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h +$(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(INCL)\artifact.h $(O)mkroom.o: mkroom.c $(HACK_H) -$(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)mondata.o: mondata.c $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h +$(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h +$(O)mondata.o: mondata.c $(HACK_H) $(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \ - $(INCL)\dungeon.h $(INCL)\eshk.h $(INCL)\vault.h \ - $(INCL)\epri.h $(INCL)\color.h + $(INCL)\dungeon.h $(INCL)\color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) -$(O)muse.o: muse.c $(HACK_H) $(INCL)\edog.h +$(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) #interp.c $(O)o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h $(O)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ @@ -1329,12 +1327,11 @@ $(O)options.o: options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \ $(HACK_H) $(INCL)\tcap.h $(O)pager.o: pager.c $(HACK_H) $(INCL)\dlb.h $(O)pickup.o: pickup.c $(HACK_H) -$(O)pline.o: pline.c $(HACK_H) $(INCL)\epri.h $(INCL)\edog.h +$(O)pline.o: pline.c $(HACK_H) $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_H) -$(O)pray.o: pray.c $(HACK_H) $(INCL)\epri.h -$(O)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\eshk.h \ - $(INCL)\epri.h $(INCL)\emin.h +$(O)pray.o: pray.c $(HACK_H) +$(O)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h $(O)quest.o: quest.c $(HACK_H) $(INCL)\qtext.h $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h $(INCL)\qtext.h $(O)read.o: read.c $(HACK_H) @@ -1346,10 +1343,10 @@ $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) $(O)rumors.o: rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)save.o: save.c $(HACK_H) $(INCL)\lev.h -$(O)shk.o: shk.c $(HACK_H) $(INCL)\eshk.h -$(O)shknam.o: shknam.c $(HACK_H) $(INCL)\eshk.h +$(O)shk.o: shk.c $(HACK_H) +$(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)\artifact.h -$(O)sounds.o: sounds.c $(HACK_H) $(INCL)\edog.h +$(O)sounds.o: sounds.c $(HACK_H) $(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\dlb.h $(INCL)\sp_lev.h $(O)spell.o: spell.c $(HACK_H) $(O)steal.o: steal.c $(HACK_H) @@ -1361,7 +1358,7 @@ $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) -$(O)vault.o: vault.c $(HACK_H) $(INCL)\vault.h +$(O)vault.o: vault.c $(HACK_H) $(O)version.o: version.c $(HACK_H) $(INCL)\date.h $(INCL)\patchlevel.h $(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index f6dfb83c0..42fc4481f 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -1,5 +1,5 @@ # SCCS Id: @(#)Makefile.gcc 3.5 $Date$ -# Copyright (c) NetHack PC Development Team 1993-2005 +# Copyright (c) NetHack PC Development Team 1993-2006 # # NetHack 3.5.x Makefile for MinGW # @@ -431,7 +431,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \ $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ $(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \ - $(INCL)/permonst.h $(INCL)/monattk.h \ + $(INCL)/permonst.h $(INCL)/mextra.h $(INCL)/monattk.h \ $(INCL)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \ $(INCL)/wintype.h $(INCL)/decl.h $(INCL)/quest.h \ $(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \ @@ -1236,7 +1236,7 @@ $(O)monstr.o: monstr.c $(CONFIG_H) $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) -$(O)apply.o: apply.c $(HACK_H) $(INCL)/edog.h +$(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) @@ -1246,20 +1246,20 @@ $(O)cmd.o: cmd.c $(HACK_H) $(INCL)/func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)/artifact.h -$(O)dig.o: dig.c $(HACK_H) $(INCL)/edog.h +$(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h $(O)do.o: do.c $(HACK_H) $(INCL)/lev.h $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) -$(O)dog.o: dog.c $(HACK_H) $(INCL)/edog.h -$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/edog.h -$(O)dokick.o: dokick.c $(HACK_H) $(INCL)/eshk.h -$(O)dothrow.o: dothrow.c $(HACK_H) $(INCL)/edog.h +$(O)dog.o: dog.c $(HACK_H) +$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)/mfndpos.h +$(O)dokick.o: dokick.c $(HACK_H) +$(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)/tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)/dgn_file.h $(INCL)/dlb.h -$(O)eat.o: eat.c $(HACK_H) $(INCL)/edog.h -$(O)end.o: end.c $(HACK_H) $(INCL)/eshk.h $(INCL)/lev.h $(INCL)/dlb.h +$(O)eat.o: eat.c $(HACK_H) +$(O)end.o: end.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h $(O)engrave.o: engrave.c $(HACK_H) $(INCL)/lev.h $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) @@ -1272,29 +1272,26 @@ $(O)invent.o: invent.c $(HACK_H) $(O)light.o: light.c $(HACK_H) $(INCL)/lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h -$(O)makemon.o: makemon.c $(HACK_H) $(INCL)/epri.h $(INCL)/emin.h \ - $(INCL)/edog.h +$(O)makemon.o: makemon.c $(HACK_H) $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) -$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)/artifact.h $(INCL)/edog.h -$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h $(INCL)/edog.h -$(O)minion.o: minion.c $(HACK_H) $(INCL)/emin.h $(INCL)/epri.h +$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)/artifact.h +$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h +$(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) -$(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/edog.h -$(O)mondata.o: mondata.c $(HACK_H) $(INCL)/eshk.h $(INCL)/epri.h -$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h \ - $(INCL)/epri.h +$(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h +$(O)mondata.o: mondata.c $(HACK_H) +$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)/permonst.h $(INCL)/align.h \ $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \ - $(INCL)/dungeon.h $(INCL)/eshk.h $(INCL)/vault.h \ - $(INCL)/epri.h $(INCL)/color.h + $(INCL)/dungeon.h $(INCL)/color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) -$(O)muse.o: muse.c $(HACK_H) $(INCL)/edog.h +$(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) #interp.c $(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ @@ -1304,12 +1301,11 @@ $(O)options.o: options.c $(CONFIG_H) $(INCL)/objclass.h $(INCL)/flag.h \ $(HACK_H) $(INCL)/tcap.h $(O)pager.o: pager.c $(HACK_H) $(INCL)/dlb.h $(O)pickup.o: pickup.c $(HACK_H) -$(O)pline.o: pline.c $(HACK_H) $(INCL)/epri.h $(INCL)/edog.h +$(O)pline.o: pline.c $(HACK_H) $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_H) -$(O)pray.o: pray.c $(HACK_H) $(INCL)/epri.h -$(O)priest.o: priest.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/eshk.h \ - $(INCL)/epri.h $(INCL)/emin.h +$(O)pray.o: pray.c $(HACK_H) +$(O)priest.o: priest.c $(HACK_H) $(INCL)/mfndpos.h $(O)quest.o: quest.c $(HACK_H) $(INCL)/qtext.h $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(INCL)/qtext.h $(O)read.o: read.c $(HACK_H) @@ -1321,10 +1317,10 @@ $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) $(O)rumors.o: rumors.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h $(O)save.o: save.c $(HACK_H) $(INCL)/lev.h -$(O)shk.o: shk.c $(HACK_H) $(INCL)/eshk.h -$(O)shknam.o: shknam.c $(HACK_H) $(INCL)/eshk.h +$(O)shk.o: shk.c $(HACK_H) +$(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)/artifact.h -$(O)sounds.o: sounds.c $(HACK_H) $(INCL)/edog.h +$(O)sounds.o: sounds.c $(HACK_H) $(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)/dlb.h $(INCL)/sp_lev.h $(O)spell.o: spell.c $(HACK_H) $(O)steal.o: steal.c $(HACK_H) @@ -1336,14 +1332,14 @@ $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) -$(O)vault.o: vault.c $(HACK_H) $(INCL)/vault.h +$(O)vault.o: vault.c $(HACK_H) $(O)version.o: version.c $(HACK_H) $(INCL)/date.h $(INCL)/patchlevel.h $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h -$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h $(INCL)/epri.h +$(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h $(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 014cde5f4..f922bd89f 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -1,5 +1,5 @@ # SCCS Id: @(#)Makefile.msc 3.5 $Date$ -# Copyright (c) NetHack PC Development Team 1993-2005 +# Copyright (c) NetHack PC Development Team 1993-2006 # # NetHack 3.5.x Makefile for MS Visual C++ V6.x and above and MS NMAKE # @@ -419,7 +419,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h $(INCL)\context.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ $(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \ - $(INCL)\permonst.h $(INCL)\monattk.h \ + $(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h \ $(INCL)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \ $(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \ $(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \ @@ -1312,7 +1312,7 @@ $(O)monstr.o: monstr.c $(CONFIG_H) $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)allmain.o: allmain.c $(HACK_H) $(O)alloc.o: alloc.c $(CONFIG_H) -$(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h +$(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) @@ -1322,20 +1322,20 @@ $(O)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h -$(O)dig.o: dig.c $(HACK_H) $(INCL)\edog.h +$(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(O)do.o: do.c $(HACK_H) $(INCL)\lev.h $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) -$(O)dog.o: dog.c $(HACK_H) $(INCL)\edog.h -$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)dokick.o: dokick.c $(HACK_H) $(INCL)\eshk.h -$(O)dothrow.o: dothrow.c $(HACK_H) $(INCL)\edog.h +$(O)dog.o: dog.c $(HACK_H) +$(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h +$(O)dokick.o: dokick.c $(HACK_H) +$(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h -$(O)eat.o: eat.c $(HACK_H) $(INCL)\edog.h -$(O)end.o: end.c $(HACK_H) $(INCL)\eshk.h $(INCL)\lev.h $(INCL)\dlb.h +$(O)eat.o: eat.c $(HACK_H) +$(O)end.o: end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)engrave.o: engrave.c $(HACK_H) $(INCL)\lev.h $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) @@ -1348,29 +1348,26 @@ $(O)invent.o: invent.c $(HACK_H) $(O)light.o: light.c $(HACK_H) $(INCL)\lev.h $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)\mail.h -$(O)makemon.o: makemon.c $(HACK_H) $(INCL)\epri.h $(INCL)\emin.h \ - $(INCL)\edog.h +$(O)makemon.o: makemon.c $(HACK_H) $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) -$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h $(INCL)\edog.h -$(O)minion.o: minion.c $(HACK_H) $(INCL)\emin.h $(INCL)\epri.h +$(O)mhitm.o: mhitm.c $(HACK_H) $(INCL)\artifact.h +$(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h +$(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) -$(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\edog.h -$(O)mondata.o: mondata.c $(HACK_H) $(INCL)\eshk.h $(INCL)\epri.h +$(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h +$(O)mondata.o: mondata.c $(HACK_H) $(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h \ - $(INCL)\epri.h $(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \ - $(INCL)\dungeon.h $(INCL)\eshk.h $(INCL)\vault.h \ - $(INCL)\epri.h $(INCL)\color.h + $(INCL)\dungeon.h $(INCL)\color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) -$(O)muse.o: muse.c $(HACK_H) $(INCL)\edog.h +$(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) #interp.c $(O)o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h $(O)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ @@ -1380,12 +1377,11 @@ $(O)options.o: options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \ $(HACK_H) $(INCL)\tcap.h $(O)pager.o: pager.c $(HACK_H) $(INCL)\dlb.h $(O)pickup.o: pickup.c $(HACK_H) -$(O)pline.o: pline.c $(HACK_H) $(INCL)\epri.h $(INCL)\edog.h +$(O)pline.o: pline.c $(HACK_H) $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_H) -$(O)pray.o: pray.c $(HACK_H) $(INCL)\epri.h -$(O)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\eshk.h \ - $(INCL)\epri.h $(INCL)\emin.h +$(O)pray.o: pray.c $(HACK_H) +$(O)priest.o: priest.c $(HACK_H) $(INCL)\mfndpos.h $(O)quest.o: quest.c $(HACK_H) $(INCL)\qtext.h $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h $(INCL)\qtext.h $(O)read.o: read.c $(HACK_H) @@ -1397,10 +1393,10 @@ $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) $(O)rumors.o: rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h $(O)save.o: save.c $(HACK_H) $(INCL)\lev.h -$(O)shk.o: shk.c $(HACK_H) $(INCL)\eshk.h -$(O)shknam.o: shknam.c $(HACK_H) $(INCL)\eshk.h +$(O)shk.o: shk.c $(HACK_H) +$(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)\artifact.h -$(O)sounds.o: sounds.c $(HACK_H) $(INCL)\edog.h +$(O)sounds.o: sounds.c $(HACK_H) $(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\dlb.h $(INCL)\sp_lev.h $(O)spell.o: spell.c $(HACK_H) $(O)steal.o: steal.c $(HACK_H) @@ -1412,14 +1408,14 @@ $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) -$(O)vault.o: vault.c $(HACK_H) $(INCL)\vault.h +$(O)vault.o: vault.c $(HACK_H) $(O)version.o: version.c $(HACK_H) $(INCL)\date.h $(INCL)\patchlevel.h $(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h -$(O)wizard.o: wizard.c $(HACK_H) $(INCL)\qtext.h $(INCL)\epri.h +$(O)wizard.o: wizard.c $(HACK_H) $(INCL)\qtext.h $(O)worm.o: worm.c $(HACK_H) $(INCL)\lev.h $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) diff --git a/win/win32/nethackw.dsp b/win/win32/nethackw.dsp index 254ebedb4..0b2490df4 100644 --- a/win/win32/nethackw.dsp +++ b/win/win32/nethackw.dsp @@ -660,26 +660,10 @@ SOURCE=..\include\dungeon.h # End Source File # Begin Source File -SOURCE=..\include\edog.h -# End Source File -# Begin Source File - -SOURCE=..\include\emin.h -# End Source File -# Begin Source File - SOURCE=..\include\engrave.h # End Source File # Begin Source File -SOURCE=..\include\epri.h -# End Source File -# Begin Source File - -SOURCE=..\include\eshk.h -# End Source File -# Begin Source File - SOURCE=..\include\extern.h # End Source File # Begin Source File @@ -732,6 +716,10 @@ SOURCE=..\include\mail.h # End Source File # Begin Source File +SOURCE=..\include\mextra.h +# End Source File +# Begin Source File + SOURCE=..\include\mfndpos.h # End Source File # Begin Source File @@ -888,10 +876,6 @@ SOURCE=..\include\unixconf.h # End Source File # Begin Source File -SOURCE=..\include\vault.h -# End Source File -# Begin Source File - SOURCE=..\include\vision.h # End Source File # Begin Source File