diff --git a/include/hack.h b/include/hack.h index 57600414f..d22197b61 100644 --- a/include/hack.h +++ b/include/hack.h @@ -202,7 +202,6 @@ typedef struct { #include "context.h" #include "rm.h" #include "botl.h" -#include "qtext.h" /* Symbol offsets */ #define SYM_OFF_P (0) diff --git a/include/qtext.h b/include/qtext.h deleted file mode 100644 index 38c535f1f..000000000 --- a/include/qtext.h +++ /dev/null @@ -1,8 +0,0 @@ -/* NetHack 3.6 qtext.h $NHDT-Date: 1505170347 2017/09/11 22:52:27 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.18 $ */ -/* Copyright (c) Mike Stephenson 1991. */ -/* NetHack may be freely redistributed. See license for details. */ - -#ifndef QTEXT_H -#define QTEXT_H - -#endif /* QTEXT_H */ diff --git a/src/quest.c b/src/quest.c index 9813a9ddb..a74cdf41b 100644 --- a/src/quest.c +++ b/src/quest.c @@ -7,7 +7,6 @@ /* quest dungeon branch routines. */ #include "quest.h" -#include "qtext.h" #define Not_firsttime (on_level(&u.uz0, &u.uz)) #define Qstat(x) (g.quest_status.x) diff --git a/src/questpgr.c b/src/questpgr.c index c139a84ac..85c272557 100644 --- a/src/questpgr.c +++ b/src/questpgr.c @@ -7,8 +7,6 @@ /* quest-specific pager routines. */ -#include "qtext.h" - #define QTEXT_FILE "quest.lua" #ifdef TTY_GRAPHICS diff --git a/src/wizard.c b/src/wizard.c index 4201b3812..0cf531ea8 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -9,7 +9,6 @@ /* - generalized for 3.1 (mike@bullns.on01.bull.ca) */ #include "hack.h" -#include "qtext.h" static short FDECL(which_arti, (int)); static boolean FDECL(mon_has_arti, (struct monst *, SHORT_P)); diff --git a/sys/amiga/Makefile.agc b/sys/amiga/Makefile.agc index 6f3c11ecf..e57e18698 100644 --- a/sys/amiga/Makefile.agc +++ b/sys/amiga/Makefile.agc @@ -422,7 +422,7 @@ $(SBIN)makedefs: $(MAKEOBJS) $(LINK) $(LNSPEC) $(SBIN)makedefs $(LIN) $(MAKEOBJS) $(LLIB) $(OO)makedefs.o: $(UTIL)makedefs.c $(I)config.h $(I)permonst.h $(I)monsym.h \ - $(I)objclass.h $(I)patchlevel.h $(I)qtext.h $(I)artilist.h + $(I)objclass.h $(I)patchlevel.h $(I)artilist.h $(CC) $(DEFSPEC)MAKEDEFS_C $(CFLAGS) $(OBJSPEC)$@ $(UTIL)makedefs.c $(SBIN)lev_comp: $(SPLEVOBJS) @@ -1071,9 +1071,9 @@ $(O)pray.o: $(NHS)pray.c $(HDEP) $(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h -$(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h $(I)qtext.h +$(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h -$(O)questpgr.o: $(NHS)questpgr.c $(HDEP) $(I)qtext.h $(I)dlb.h +$(O)questpgr.o: $(NHS)questpgr.c $(HDEP) $(I)dlb.h $(O)read.o: $(NHS)read.c $(HDEP) @@ -1140,7 +1140,7 @@ $(O)wield.o: $(NHS)wield.c $(HDEP) $(O)windows.o: $(NHS)windows.c $(HDEP) $(I)wintty.h -$(O)wizard.o: $(NHS)wizard.c $(HDEP) $(I)qtext.h +$(O)wizard.o: $(NHS)wizard.c $(HDEP) $(O)worm.o: $(NHS)worm.c $(HDEP) $(I)lev.h diff --git a/sys/amiga/Makefile.ami b/sys/amiga/Makefile.ami index 43e8dbe98..3ad97af5e 100644 --- a/sys/amiga/Makefile.ami +++ b/sys/amiga/Makefile.ami @@ -690,7 +690,7 @@ $(SBIN)makedefs: $(MAKEOBJS) $(LINK) $(LNSPEC) $(SBIN)makedefs $(LIN) $(MAKEOBJS) $(LLIB) $(OO)makedefs.o: $(UTIL)makedefs.c $(I)config.h $(I)permonst.h $(I)monsym.h \ - $(I)objclass.h $(I)patchlevel.h $(I)qtext.h $(I)artilist.h + $(I)objclass.h $(I)patchlevel.h $(I)artilist.h $(CC) $(DEFSPEC)MAKEDEFS_C $(CFLAGS) $(OBJSPEC)$@ $(UTIL)makedefs.c $(SBIN)lev_comp: $(SPLEVOBJS) @@ -1403,9 +1403,9 @@ $(O)pray.o: $(NHS)pray.c $(HDEP) $(O)priest.o: $(NHS)priest.c $(HDEP) $(I)mfndpos.h -$(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h $(I)qtext.h +$(O)quest.o: $(NHS)quest.c $(HDEP) $(I)quest.h -$(O)questpgr.o: $(NHS)questpgr.c $(HDEP) $(I)qtext.h $(I)dlb.h +$(O)questpgr.o: $(NHS)questpgr.c $(HDEP) $(I)dlb.h $(O)read.o: $(NHS)read.c $(HDEP) @@ -1476,7 +1476,7 @@ $(O)wield.o: $(NHS)wield.c $(HDEP) $(O)windows.o: $(NHS)windows.c $(HDEP) $(I)wintty.h -$(O)wizard.o: $(NHS)wizard.c $(HDEP) $(I)qtext.h +$(O)wizard.o: $(NHS)wizard.c $(HDEP) $(O)worm.o: $(NHS)worm.c $(HDEP) $(I)lev.h diff --git a/sys/msdos/Makefile.BC b/sys/msdos/Makefile.BC index b537ad0e7..c68df0593 100644 --- a/sys/msdos/Makefile.BC +++ b/sys/msdos/Makefile.BC @@ -888,7 +888,6 @@ OBJ_H = $(INCL)\obj.h OBJCLASS_H = $(INCL)\objclass.h OBJECTS_H = $(INCL)\objects.h PROP_H = $(INCL)\prop.h -QTEXT_H = $(INCL)\qtext.h QUEST_H = $(INCL)\quest.h SP_LEV_H = $(INCL)\sp_lev.h TERMCAP_H = $(INCL)\tcap.h @@ -1025,7 +1024,7 @@ $(U)makedefs.exe: $(MAKEOBJS) @$(LINK) $(LFLAGSU) $(MAKEOBJS), $@,, $(CLIB) $(BCMDL); $(O)makedefs.o: $(CONFIG_H) $(PERMONST_H) $(OBJCLASS_H) \ - $(MONSYM_H) $(QTEXT_H) $(PATCHLEVEL_H) \ + $(MONSYM_H) $(PATCHLEVEL_H) \ $(U)makedefs.c @echo $(BCOPTS1) > $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) @@ -1854,8 +1853,8 @@ $(O)pager.o: $(SRC)\pager.c $(HACK_H) $(DLB_H) $(CC) $(CFLAGNO) $(COBJNAM)$@ $(SRC)\pager.c $(O)pickup.o: $(PCHO) $(SRC)\pickup.c $(HACK_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)quest.o: $(PCHO) $(SRC)\quest.c $(HACK_H) $(QUEST_H) +$(O)questpgr.o: $(PCHO) $(SRC)\questpgr.c $(HACK_H) $(DLB_H) $(O)rect.o: $(PCHO) $(SRC)\rect.c $(HACK_H) $(O)region.o: $(PCHO) $(SRC)\region.c $(HACK_H) $(O)restore.o: $(PCHO) $(SRC)\restore.c $(HACK_H) $(LEV_H) $(TERMCAP_H) \ @@ -1938,7 +1937,7 @@ $(O)trap.0: $(PCH0) $(SRC)\trap.c $(HACK_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) +$(O)wizard.0: $(PCH0) $(SRC)\wizard.c $(HACK_H) $(O)zap.0: $(PCH0) $(SRC)\zap.c $(HACK_H) # @@ -2067,7 +2066,7 @@ $(O)trap.B: $(PCHB) $(SRC)\trap.c $(HACK_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) +$(O)wizard.B: $(PCHB) $(SRC)\wizard.c $(HACK_H) $(O)zap.B: $(PCHB) $(SRC)\zap.c $(HACK_H) # end of file diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index fa40661c3..b924f8019 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -749,7 +749,7 @@ $(U)makedefs.exe: $(MAKEDEFSOBJS) $(LINK) $(LFLAGS) -o$@ $(MAKEDEFSOBJS) $(O)makedefs.o: $(CONFIG_H) $(PERMONST_H) $(INCL)/objclass.h \ - $(INCL)/monsym.h $(INCL)/qtext.h $(U)makedefs.c + $(INCL)/monsym.h $(U)makedefs.c ifneq "$(ADD_LUA)" "Y" #========================================== @@ -1468,8 +1468,8 @@ $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_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)quest.o: quest.c $(HACK_H) +$(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) $(O)region.o: region.c $(HACK_H) $(INCL)/lev.h @@ -1502,7 +1502,7 @@ $(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 +$(O)wizard.o: wizard.c $(HACK_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 488382a7a..90c9462d6 100644 --- a/sys/msdos/Makefile.MSC +++ b/sys/msdos/Makefile.MSC @@ -583,7 +583,7 @@ $(U)makedefs.exe: $(MAKEOBJS) << makedefs.o: $(CONFIG_H) $(PERMONST_H) $(INCL)\objclass.h \ - $(INCL)\monsym.h $(INCL)\qtext.h $(UTIL)\makedefs.c + $(INCL)\monsym.h $(UTIL)\makedefs.c # The following include files depend on makedefs to be created. # @@ -1181,8 +1181,8 @@ polyself.o: polyself.c $(HACK_H) potion.o: potion.c $(HACK_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 +quest.o: quest.c $(HACK_H) +questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h read.o: read.c $(HACK_H) rect.o: rect.c $(HACK_H) region.o: region.c $(HACK_H) @@ -1215,7 +1215,7 @@ weapon.o: weapon.c $(HACK_H) were.o: were.c $(HACK_H) wield.o: wield.c $(HACK_H) windows.o: windows.c $(HACK_H) $(INCL)\wingem.h -wizard.o: wizard.c $(HACK_H) $(INCL)\qtext.h +wizard.o: wizard.c $(HACK_H) worm.o: worm.c $(HACK_H) $(INCL)\lev.h worn.o: worn.c $(HACK_H) write.o: write.c $(HACK_H) diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross index 1cdc6d287..a2af8b1fb 100644 --- a/sys/msdos/Makefile1.cross +++ b/sys/msdos/Makefile1.cross @@ -192,19 +192,34 @@ YOU_H = $(MONST_H) $(YOUPROP_H) $(INCL)/align.h \ DISPLAY_H = $(MONDATA_H) $(INCL)/vision.h $(INCL)/display.h PCCONF_H = $(INCL)/micro.h $(INCL)/system.h $(INCL)/pcconf.h \ $(MSYS)/pcvideo.h -CONFIG_H = $(GLOBAL_H) $(INCL)/tradstdc.h $(INCL)/config1.h \ - $(INCL)/config.h DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \ $(INCL)/obj.h $(INCL)/onames.h $(INCL)/pm.h \ $(INCL)/decl.h GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h -HACK_H = $(CONFIG_H) $(INCL)/context.h $(DUNGEON_H) \ - $(DECL_H) $(DISPLAY_H) $(INCL)/monsym.h \ - $(INCL)/mkroom.h $(INCL)/objclass.h $(INCL)/trap.h \ - $(INCL)/flag.h $(RM_H) $(INCL)/vision.h \ - $(INCL)/wintype.h $(INCL)/engrave.h $(INCL)/rect.h \ - $(INCL)/trampoli.h $(INCL)/hack.h $(REGION_H) \ - $(INCL)/sys.h + +CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ + $(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \ + $(INCL)/system.h $(INCL)/nhlua.h $(INCL)/unixconf.h \ + $(INCL)/os2conf.h $(INCL)/micro.h $(INCL)/pcconf.h \ + $(INCL)/tosconf.h $(INCL)/amiconf.h $(INCL)/macconf.h \ + $(INCL)/beconf.h $(INCL)/wceconf.h $(INCL)/ntconf.h + +HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/lint.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)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \ + $(INCL)/wintype.h $(INCL)/context.h $(INCL)/rm.h \ + $(INCL)/botl.h $(INCL)/rect.h \ + $(INCL)/region.h $(INCL)/decl.h $(INCL)/quest.h \ + $(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \ + $(INCL)/you.h $(INCL)/attrib.h $(INCL)/monst.h \ + $(INCL)/mextra.h $(INCL)/skills.h $(INCL)/onames.h \ + $(INCL)/timeout.h $(INCL)/trap.h $(INCL)/flag.h \ + $(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \ + $(INCL)/winprocs.h $(INCL)/sys.h $(INCL)/wintty.h \ + $(INCL)/trampoli.h + DLB_H = $(INCL)/dlb.h ifeq ($(SUPPRESS_GRAPHICS),Y) @@ -396,9 +411,13 @@ hobj.tag: $(U)makedefs: $(MAKEDEFSOBJS) $(HOST_LINK) $(LFLAGS) -o$@ $(MAKEDEFSOBJS) -$(HOST_O)makedefs.o: $(CONFIG_H) $(PERMONST_H) $(INCL)/objclass.h \ - $(INCL)/monsym.h $(INCL)/qtext.h $(U)makedefs.c - $(HOST_CC) $(cflags) -o$@ $(U)makedefs.c +$(O)makedefs$(HOST).o: + +$(HOST_O)makedefs.o: $(U)makedefs.c $(SRC)/mdlib.c $(CONFIG_H) $(INCL)/permonst.h \ + $(INCL)/objclass.h $(INCL)/monsym.h \ + $(INCL)/artilist.h $(INCL)/dungeon.h $(INCL)/obj.h \ + $(INCL)/monst.h $(INCL)/you.h $(INCL)/flag.h \ + $(INCL)/dlb.h $(INCL)/patchlevel.h #============================================= # Header file moves required for tile support diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross index 6b0b79632..978c013a3 100644 --- a/sys/msdos/Makefile2.cross +++ b/sys/msdos/Makefile2.cross @@ -440,19 +440,34 @@ YOU_H = $(MONST_H) $(YOUPROP_H) $(INCL)/align.h \ DISPLAY_H = $(MONDATA_H) $(INCL)/vision.h $(INCL)/display.h PCCONF_H = $(INCL)/micro.h $(INCL)/system.h $(INCL)/pcconf.h \ $(MSYS)/pcvideo.h -CONFIG_H = $(GLOBAL_H) $(INCL)/tradstdc.h $(INCL)/config1.h \ - $(INCL)/config.h DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \ $(INCL)/obj.h $(INCL)/onames.h $(INCL)/pm.h \ $(INCL)/decl.h GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h -HACK_H = $(CONFIG_H) $(INCL)/context.h $(DUNGEON_H) \ - $(DECL_H) $(DISPLAY_H) $(INCL)/monsym.h \ - $(INCL)/mkroom.h $(INCL)/objclass.h $(INCL)/trap.h \ - $(INCL)/flag.h $(RM_H) $(INCL)/vision.h \ - $(INCL)/wintype.h $(INCL)/engrave.h $(INCL)/rect.h \ - $(INCL)/trampoli.h $(INCL)/hack.h $(REGION_H) \ - $(INCL)/sys.h + +CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ + $(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \ + $(INCL)/system.h $(INCL)/nhlua.h $(INCL)/unixconf.h \ + $(INCL)/os2conf.h $(INCL)/micro.h $(INCL)/pcconf.h \ + $(INCL)/tosconf.h $(INCL)/amiconf.h $(INCL)/macconf.h \ + $(INCL)/beconf.h $(INCL)/wceconf.h $(INCL)/ntconf.h + +HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/lint.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)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \ + $(INCL)/wintype.h $(INCL)/context.h $(INCL)/rm.h \ + $(INCL)/botl.h $(INCL)/rect.h \ + $(INCL)/region.h $(INCL)/decl.h $(INCL)/quest.h \ + $(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \ + $(INCL)/you.h $(INCL)/attrib.h $(INCL)/monst.h \ + $(INCL)/mextra.h $(INCL)/skills.h $(INCL)/onames.h \ + $(INCL)/timeout.h $(INCL)/trap.h $(INCL)/flag.h \ + $(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \ + $(INCL)/winprocs.h $(INCL)/sys.h $(INCL)/wintty.h \ + $(INCL)/trampoli.h + DLB_H = $(INCL)/dlb.h ifeq ($(SUPPRESS_GRAPHICS),Y) @@ -1104,8 +1119,8 @@ $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_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)quest.o: quest.c $(HACK_H) +$(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) $(O)region.o: region.c $(HACK_H) $(INCL)/lev.h @@ -1138,7 +1153,7 @@ $(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 +$(O)wizard.o: wizard.c $(HACK_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/os2/Makefile.os2 b/sys/os2/Makefile.os2 index 4afcf0fdf..2c1045a4c 100644 --- a/sys/os2/Makefile.os2 +++ b/sys/os2/Makefile.os2 @@ -950,7 +950,7 @@ $(TEMP)\makedefs.rsp : $(MAKEOBJS) $(TEMP)\$(MKDFDEF) $(ECHO) $(MKDFMD) $(LFLAGS);>> $@ $(OBJ)\makedefs.o : $(UTIL)\$(CB) $(CONFIG_H) $(INCL)\permonst.h $(INCL)\objclass.h \ - $(INCL)\monsym.h $(INCL)\artilist.h $(INCL)\qtext.h + $(INCL)\monsym.h $(INCL)\artilist.h $(UTILCC) # @@ -1643,9 +1643,9 @@ $(OBJ)\pray.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\priest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\mfndpos.h $(SRCCC) -$(OBJ)\quest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\quest.h $(INCL)\qtext.h +$(OBJ)\quest.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\quest.h $(SRCCC) -$(OBJ)\questpgr.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\qtext.h +$(OBJ)\questpgr.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\read.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1711,7 +1711,7 @@ $(OBJ)\wield.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\windows.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\wizard.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\qtext.h +$(OBJ)\wizard.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\worm.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(SRCCC) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index ee4254ed9..9f981a72b 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -640,7 +640,7 @@ $(MAKEDEFS): $(FIRSTOBJ) \ ../include/objclass.h ../include/monsym.h \ ../include/artilist.h ../include/dungeon.h ../include/obj.h \ ../include/monst.h ../include/you.h ../include/flag.h \ - ../include/dlb.h ../include/patchlevel.h ../include/qtext.h + ../include/dlb.h ../include/patchlevel.h @( cd ../util ; $(MAKE) makedefs ) # Source files created by 'makedefs' at build time. @@ -742,7 +742,7 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ ../include/permonst.h ../include/monattk.h \ ../include/monflag.h ../include/mondata.h ../include/pm.h \ ../include/wintype.h ../include/context.h ../include/rm.h \ - ../include/botl.h ../include/qtext.h ../include/rect.h \ + ../include/botl.h ../include/rect.h \ ../include/region.h ../include/decl.h ../include/quest.h \ ../include/spell.h ../include/color.h ../include/obj.h \ ../include/you.h ../include/attrib.h ../include/monst.h \ diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl index b27e91ded..53a0805fb 100644 --- a/sys/unix/Makefile.utl +++ b/sys/unix/Makefile.utl @@ -226,7 +226,7 @@ makedefs.o: makedefs.c ../src/mdlib.c $(CONFIG_H) ../include/permonst.h \ ../include/objclass.h ../include/monsym.h \ ../include/artilist.h ../include/dungeon.h ../include/obj.h \ ../include/monst.h ../include/you.h ../include/flag.h \ - ../include/dlb.h ../include/patchlevel.h ../include/qtext.h + ../include/dlb.h ../include/patchlevel.h # Don't require perl to build; that is why mdgrep.h is spelled wrong below. mdgreph: mdgrep.pl diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index d0658d0a8..f0088d4fd 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -267,7 +267,6 @@ 3186A38F21A4B0FC0052BF02 /* monflag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = monflag.h; path = ../../include/monflag.h; sourceTree = ""; }; 3186A39021A4B0FC0052BF02 /* lev_comp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lev_comp.h; path = ../../include/lev_comp.h; sourceTree = ""; }; 3186A39121A4B0FC0052BF02 /* micro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = micro.h; path = ../../include/micro.h; sourceTree = ""; }; - 3186A39221A4B0FC0052BF02 /* qtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qtext.h; path = ../../include/qtext.h; sourceTree = ""; }; 3186A39321A4B0FC0052BF02 /* xwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xwindow.h; path = ../../include/xwindow.h; sourceTree = ""; }; 3186A39421A4B0FC0052BF02 /* tileset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tileset.h; path = ../../include/tileset.h; sourceTree = ""; }; 3186A39521A4B0FC0052BF02 /* obj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = obj.h; path = ../../include/obj.h; sourceTree = ""; }; @@ -765,7 +764,6 @@ 3186A37821A4B0FA0052BF02 /* qt_kde0.h */, 3186A3B421A4B0FD0052BF02 /* qt_win.h */, 3186A3BD21A4B0FD0052BF02 /* qt_xpms.h */, - 3186A39221A4B0FC0052BF02 /* qtext.h */, 3186A3C421A4B0FE0052BF02 /* qttableview.h */, 3186A39E21A4B0FD0052BF02 /* quest.h */, 3186A37C21A4B0FA0052BF02 /* rect.h */, diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index 957335710..0908ba590 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -313,7 +313,7 @@ $(MAKEDEFS) : $(FIRSTOBJ) $(UTL)makedefs.c \ $(CONFIG_H) $(INC)permonst.h $(INC)objclass.h \ $(INC)monsym.h $(INC)artilist.h $(INC)dungeon.h \ $(INC)obj.h $(INC)monst.h $(INC)you.h $(INC)flag.h \ - $(INC)dlb.h $(INC)patchlevel.h $(INC)qtext.h \ + $(INC)dlb.h $(INC)patchlevel.h \ $(LIBOPT) $(ID_OPT) $(CD) $(UTL) $(MAKE)$(MAKEFLAGS) $(MAKEDEFS) @@ -557,8 +557,8 @@ polyself.obj : polyself.c $(HACK_H) potion.obj : potion.c $(HACK_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 +quest.obj : quest.c $(HACK_H) +questpgr.obj : questpgr.c $(HACK_H) $(INC)dlb.h read.obj : read.c $(HACK_H) rect.obj : rect.c $(HACK_H) region.obj : region.c $(HACK_H) $(INC)lev.h @@ -591,7 +591,7 @@ weapon.obj : weapon.c $(HACK_H) were.obj : were.c $(HACK_H) wield.obj : wield.c $(HACK_H) windows.obj : windows.c $(HACK_H) $(INC)wingem.h $(INC)winGnome.h -wizard.obj : wizard.c $(HACK_H) $(INC)qtext.h +wizard.obj : wizard.c $(HACK_H) worm.obj : worm.c $(HACK_H) $(INC)lev.h worn.obj : worn.c $(HACK_H) write.obj : write.c $(HACK_H) diff --git a/sys/vms/Makefile.utl b/sys/vms/Makefile.utl index 0766930c8..713a37995 100644 --- a/sys/vms/Makefile.utl +++ b/sys/vms/Makefile.utl @@ -167,7 +167,7 @@ makedefs.obj : makedefs.c \ $(CONFIG_H) $(INC)permonst.h $(INC)objclass.h \ $(INC)monsym.h $(INC)artilist.h $(INC)dungeon.h \ $(INC)obj.h $(INC)monst.h $(INC)you.h $(INC)flag.h \ - $(INC)dlb.h $(INC)patchlevel.h $(INC)qtext.h + $(INC)dlb.h $(INC)patchlevel.h $(INC)onames.h : $(MAKEDEFS) $(RUN) $(MAKEDEFS) -o diff --git a/sys/wince/bootstrp.mak b/sys/wince/bootstrp.mak index 5d92dc760..7fe11616a 100644 --- a/sys/wince/bootstrp.mak +++ b/sys/wince/bootstrp.mak @@ -291,7 +291,7 @@ $(U)makedefs.exe: $(MAKEOBJS) $(link) $(LFLAGSU) -out:$@ $(MAKEOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objclass.h \ - $(INCL)\monsym.h $(INCL)\qtext.h $(INCL)\patchlevel.h \ + $(INCL)\monsym.h $(INCL)\patchlevel.h \ $(U)makedefs.c if not exist $(OBJ)\*.* echo creating directory $(OBJ) if not exist $(OBJ)\*.* mkdir $(OBJ) @@ -834,8 +834,8 @@ $(O)polyself.o: $(SRC)\polyself.c $(HACK_H) $(O)potion.o: $(SRC)\potion.c $(HACK_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)quest.o: $(SRC)\quest.c $(HACK_H) +$(O)questpgr.o: $(SRC)\questpgr.c $(HACK_H) $(INCL)\dlb.h $(O)read.o: $(SRC)\read.c $(HACK_H) $(O)rect.o: $(SRC)\rect.c $(HACK_H) $(O)region.o: $(SRC)\region.c $(HACK_H) $(INCL)\lev.h @@ -867,7 +867,7 @@ $(O)weapon.o: $(SRC)\weapon.c $(HACK_H) $(O)were.o: $(SRC)\were.c $(HACK_H) $(O)wield.o: $(SRC)\wield.c $(HACK_H) $(O)windows.o: $(SRC)\windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h -$(O)wizard.o: $(SRC)\wizard.c $(HACK_H) $(INCL)\qtext.h +$(O)wizard.o: $(SRC)\wizard.c $(HACK_H) $(O)worm.o: $(SRC)\worm.c $(HACK_H) $(INCL)\lev.h $(O)worn.o: $(SRC)\worn.c $(HACK_H) $(O)write.o: $(SRC)\write.c $(HACK_H) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 5ba9ef68a..5119d3eec 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -899,7 +899,7 @@ $(U)makedefs.exe: $(MAKEOBJS) $(link) $(LFLAGSU) -o$@ $(MAKEOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)/monattk.h $(INCL)/monflag.h \ - $(INCL)/objclass.h $(INCL)/monsym.h $(INCL)/qtext.h \ + $(INCL)/objclass.h $(INCL)/monsym.h \ $(INCL)/patchlevel.h $(U)makedefs.c $(cc) $(CFLAGSU) -o$@ $(U)makedefs.c @@ -1607,8 +1607,8 @@ $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_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)quest.o: quest.c $(HACK_H) +$(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) $(O)region.o: region.c $(HACK_H) $(INCL)/lev.h @@ -1642,7 +1642,7 @@ $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windmain.o: $(MSWSYS)/windmain.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 +$(O)wizard.o: wizard.c $(HACK_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 aff743a53..e11078f64 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -486,28 +486,27 @@ PDCLIB = CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ $(INCL)\global.h $(INCL)\coord.h $(INCL)\vmsconf.h \ - $(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \ - $(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \ - $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ - $(INCL)\ntconf.h + $(INCL)\system.h $(INCL)\nhlua.h $(INCL)\unixconf.h \ + $(INCL)\os2conf.h $(INCL)\micro.h $(INCL)\pcconf.h \ + $(INCL)\tosconf.h $(INCL)\amiconf.h $(INCL)\macconf.h \ + $(INCL)\beconf.h $(INCL)\wceconf.h $(INCL)\ntconf.h -HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h $(INCL)\context.h \ +HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.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)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \ - $(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \ + $(INCL)\wintype.h $(INCL)\context.h $(INCL)\rm.h \ + $(INCL)\botl.h $(INCL)\rect.h \ + $(INCL)\region.h $(INCL)\decl.h $(INCL)\quest.h \ $(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \ - $(INCL)\you.h $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\lint.h \ + $(INCL)\you.h $(INCL)\attrib.h $(INCL)\monst.h \ $(INCL)\mextra.h $(INCL)\skills.h $(INCL)\onames.h \ - $(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \ + $(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h \ $(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \ - $(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h $(INCL)\botl.h \ - $(INCL)\wintty.h $(INCL)\sys.h $(INCL)\trampoli.h + $(INCL)\winprocs.h $(INCL)\sys.h $(INCL)\wintty.h \ + $(INCL)\trampoli.h -LEV_H = $(INCL)\lev.h -DGN_FILE_H = $(INCL)\dgn_file.h -SP_LEV_H = $(INCL)\sp_lev.h TILE_H = ..\win\share\tile.h #========================================== @@ -793,7 +792,7 @@ DLB = #========================================== {$(TTY)}.c{$(OBJ)}.o: - $(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< + @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== @@ -801,7 +800,7 @@ DLB = #========================================== {$(MSWIN)}.c{$(OBJ)}.o: - $(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< + @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $< #========================================== # Rules for files in win\curses @@ -1077,13 +1076,15 @@ $(U)makedefs.exe: $(MAKEDEFSOBJS) @echo Linking $(@:\=/) @$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(MAKEDEFSOBJS) -$(O)makedefs$(HOST).o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objclass.h \ - $(INCL)\monsym.h $(INCL)\qtext.h $(INCL)\patchlevel.h \ - $(U)makedefs.c +$(O)makedefs$(HOST).o: $(U)makedefs.c $(SRC)\mdlib.c $(CONFIG_H) $(INCL)\permonst.h \ + $(INCL)\objclass.h $(INCL)\monsym.h \ + $(INCL)\artilist.h $(INCL)\dungeon.h $(INCL)\obj.h \ + $(INCL)\monst.h $(INCL)\you.h $(INCL)\flag.h \ + $(INCL)\dlb.h $(INCL)\patchlevel.h @if not exist $(OBJ)\*.* echo creating directory $(OBJ:\=/) @if not exist $(OBJ)\*.* mkdir $(OBJ) - $(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)makedefs.c -# $(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /EP -Fo$@ $(U)makedefs.c >makedefs.c.preprocessed + @$(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)makedefs.c +# @$(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /EP -Fo$@ $(U)makedefs.c >makedefs.c.preprocessed # # date.h should be remade every time any of the source or include @@ -1383,7 +1384,7 @@ $(O)pdcurses.lib : $(PDCLIBOBJS) $(PDCOBJS) lib -nologo /out:$@ $(PDCLIBOBJS) $(PDCOBJS) $(O)pdcscrn.o : $(PDCURSES_HEADERS) $(PDCWINCON)\pdcscrn.c $(MSWSYS)\stub-pdcscrn.c - $(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(MSWSYS)\stub-pdcscrn.c + @$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(MSWSYS)\stub-pdcscrn.c #=============================================================================== # LUA @@ -1422,12 +1423,12 @@ $(O)lapi.o: $(LUASRC)\lapi.c !IFDEF CROSSCOMPILE_HOST $(O)mdlib$(HOST).o: $(SRC)\mdlib.c - $(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_HOST) -Fo$@ $(SRC)\mdlib.c + @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_HOST) -Fo$@ $(SRC)\mdlib.c !ENDIF $(O)mdlib.o: $(SRC)\mdlib.c - $(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SRC)\mdlib.c -# $(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EP -Fo$@ $(SRC)\mdlib.c >mdlib.c.preprocessed + @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SRC)\mdlib.c +# @$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EP -Fo$@ $(SRC)\mdlib.c >mdlib.c.preprocessed #=============================================================================== # Housekeeping @@ -1698,148 +1699,315 @@ $(O)curswins.o: $(WCURSES)\curswins.c $(WCURSES)\curswins.h $(INCL)\wincurs.h # * slashes changed to back-slashes # * -c (which is included in CFLAGS) substituted with -Fo$@ # * $(CFLAGS) replaced with $(cflagsBuild) -# * $(CC) replaced with @$(CC) +# * $(CC) replaced with @$(cc) # * targets prefixed with $(O) +# * win/X11/Window.o commented due to conflict with pdcurses +# * most recipes below are commented out because the flags are incorrect +# and probably a different variant is used above # but otherwise untouched. # That means that there is some irrelevant stuff # in here, but maintenance should be easier. # - $(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\atari\tos.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\atari\tos.c +$(O)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\pcmain.c +$(O)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\pcsys.c $(O)pctty.o: ..\sys\share\pctty.c $(HACK_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\share\pctty.c -$(O)isaac64.o: ..\src\isaac64.c $(HACK_H) $(INCL)\isaac64.h $(INCL)\integer.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\src\isaac64.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\pctty.c +$(O)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\pcunix.c +$(O)pmatchregex.o: ..\sys\share\pmatchregex.c $(HACK_H) +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\pmatchregex.c +$(O)posixregex.o: ..\sys\share\posixregex.c $(HACK_H) +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\posixregex.c $(O)random.o: ..\sys\share\random.c $(HACK_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\share\random.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\random.c $(O)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\share\ioctl.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\ioctl.c $(O)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\share\unixtty.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\share\unixtty.c $(O)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\unix\unixmain.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\unix\unixmain.c $(O)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\unix\unixunix.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\unix\unixunix.c $(O)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\unix\unixres.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\unix\unixres.c $(O)bemain.o: ..\sys\be\bemain.c $(HACK_H) $(INCL)\dlb.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\sys\be\bemain.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\sys\be\bemain.c $(O)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\tty\getline.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\getline.c $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\tty\termcap.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\termcap.c $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\tty\topl.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\topl.c $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h $(INCL)\tcap.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\tty\wintty.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\tty\wintty.c +$(O)cursmain.o: ..\win\curses\cursmain.c $(HACK_H) $(INCL)\patchlevel.h \ + $(INCL)\wincurs.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursmain.c +$(O)curswins.o: ..\win\curses\curswins.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\curswins.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\curswins.c +$(O)cursmisc.o: ..\win\curses\cursmisc.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursmisc.h $(INCL)\func_tab.h $(INCL)\dlb.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursmisc.c +$(O)cursdial.o: ..\win\curses\cursdial.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursdial.h $(INCL)\func_tab.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursdial.c +$(O)cursstat.o: ..\win\curses\cursstat.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursstat.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursstat.c +$(O)cursinit.o: ..\win\curses\cursinit.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursinit.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursinit.c +$(O)cursmesg.o: ..\win\curses\cursmesg.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursmesg.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursmesg.c +$(O)cursinvt.o: ..\win\curses\cursinvt.c $(HACK_H) $(INCL)\wincurs.h \ + ..\win\curses\cursinvt.h +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\curses\cursinvt.c #$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ -# $(CONFIG_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\Window.c -$(O)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\dialogs.c +# $(CONFIG_H) $(INCL)\lint.h +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\Window.c +$(O)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) $(INCL)\lint.h +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\dialogs.c $(O)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\winX.h $(INCL)\dlb.h \ - ..\win\X11\nh72icon ..\win\X11\nh56icon ..\win\X11\nh32icon -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winX.c + $(INCL)\xwindow.h ..\win\X11\nh72icon ..\win\X11\nh56icon \ + ..\win\X11\nh32icon +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winX.c $(O)winmap.o: ..\win\X11\winmap.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\dlb.h \ $(INCL)\winX.h $(INCL)\tile2x11.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winmap.c +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winmap.c $(O)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winmenu.c +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winmenu.c $(O)winmesg.o: ..\win\X11\winmesg.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\winX.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winmesg.c +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winmesg.c $(O)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\winX.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winmisc.c -$(O)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winstat.c +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winmisc.c +$(O)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winstat.c $(O)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\wintext.c +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\wintext.c $(O)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\X11\winval.c -$(O)tile.o: $(SRC)\tile.c $(HACK_H) +# @$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@ ..\win\X11\winval.c +$(O)tile.o: tile.c $(HACK_H) $(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \ ..\win\gnome\gnmain.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c -$(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnmain.h \ - ..\win\gnome\gnmenu.h ..\win\gnome\gnaskstr.h \ - ..\win\gnome\gnyesno.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnbind.c -$(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(INCL)\tile2x11.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c +$(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnomeprv.h \ + $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlevel.h \ + $(INCL)\winGnome.h ..\win\gnome\gnmain.h \ + ..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \ + ..\win\gnome\gnplayer.h ..\win\gnome\gnsignal.h \ + ..\win\gnome\gnglyph.h ..\win\gnome\gnstatus.h \ + ..\win\gnome\gntext.h ..\win\gnome\gnmesg.h \ + ..\win\gnome\gnyesno.h ..\win\gnome\gnworn.h \ + ..\win\gnome\gnaskstr.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnbind.c +$(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(CONFIG_H) \ + $(INCL)\tile2x11.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \ - ..\win\gnome\gnbind.h ..\win\gnome\gnopts.h $(HACK_H) \ - $(INCL)\date.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmain.c -$(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h ..\win\gnome\gnglyph.h \ - ..\win\gnome\gnsignal.h $(HACK_H) -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c -$(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h ..\win\gnome\gnmain.h \ - ..\win\gnome\gnbind.h $(INCL)\func_tab.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c -$(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h ..\win\gnome\gnsignal.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnglyph.h ..\win\gnome\gnbind.h \ + ..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \ + ..\win\gnome\gnplayer.h ..\win\gnome\gnstatus.h \ + ..\win\gnome\gntext.h ..\win\gnome\gnmesg.h \ + ..\win\gnome\gnyesno.h ..\win\gnome\gnworn.h \ + ..\win\gnome\gnopts.h $(INCL)\date.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmain.c +$(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h $(CONFIG_H) \ + ..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \ + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c +$(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h $(CONFIG_H) \ + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnmain.h ..\win\gnome\gnbind.h \ + ..\win\gnome\gnmap.h ..\win\gnome\gnplayer.h \ + ..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \ + ..\win\gnome\gnstatus.h ..\win\gnome\gntext.h \ + ..\win\gnome\gnmesg.h ..\win\gnome\gnyesno.h \ + ..\win\gnome\gnworn.h $(INCL)\func_tab.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c +$(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h $(CONFIG_H) \ + ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \ + $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnglyph.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c $(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \ - ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H) -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnopts.c + $(CONFIG_H) ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H) +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnopts.c $(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \ ..\win\gnome\gnmain.h $(HACK_H) -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c $(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \ - ..\win\gnome\gnmain.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c -$(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h \ - ..\win\gnome\gnsignal.h ..\win\gnome\gn_xpms.h \ - ..\win\gnome\gnomeprv.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c -$(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h ..\win\gnome\gnmain.h \ - ..\win\gnome\gn_rip.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c -$(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h ..\win\gnome\gnyesno.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnyesno.c -$(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h ..\win\gnome\gnglyph.h \ - ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h -# @$(CC) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnglyph.h ..\win\gnome\gnmain.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c +$(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h $(CONFIG_H) \ + ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \ + $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnglyph.h ..\win\gnome\gn_xpms.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c +$(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h $(CONFIG_H) \ + ..\win\gnome\gnmain.h ..\win\gnome\gn_rip.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c +$(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h \ + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h \ + ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h \ + ..\win\gnome\gnmenu.h ..\win\gnome\gnplayer.h \ + ..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \ + ..\win\gnome\gnstatus.h ..\win\gnome\gntext.h \ + ..\win\gnome\gnmesg.h ..\win\gnome\gnyesno.h \ + ..\win\gnome\gnworn.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnyesno.c +$(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h $(CONFIG_H) \ + ..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \ + ..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \ + $(INCL)\patchlevel.h $(INCL)\winGnome.h +# @$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c $(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\wingem.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\gem\wingem.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\gem\wingem.c $(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \ $(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\gem\wingem1.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\gem\wingem1.c $(O)load_img.o: ..\win\gem\load_img.c $(INCL)\load_img.h - @$(CC) $(cflagsBuild) -Fo$@ ..\win\gem\load_img.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\gem\load_img.c $(O)gr_rect.o: ..\win\gem\gr_rect.c $(INCL)\gr_rect.h -# @$(CC) $(cflagsBuild) -Fo$@ ..\win\gem\gr_rect.c -$(O)tile.o: $(SRC)\tile.c $(HACK_H) -$(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \ +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\gem\gr_rect.c +$(O)tile.o: tile.c $(HACK_H) +#cppregex.o: ..\sys\share\cppregex.cpp +# $(CXX) $(CXXFLAGS) -Fo$@ ..\sys\share\cppregex.cpp +$(O)qt_bind.o: ..\win\Qt\qt_bind.cpp $(HACK_H) ..\win\Qt\qt_bind.h \ + ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h ..\win\Qt\qt_click.h \ + ..\win\Qt\qt_delay.h ..\win\Qt\qt_xcmd.h ..\win\Qt\qt_key.h \ + ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h ..\win\Qt\qt_clust.h \ + ..\win\Qt\qt_menu.h ..\win\Qt\qt_rip.h ..\win\Qt\qt_msg.h \ + ..\win\Qt\qt_plsel.h ..\win\Qt\qt_svsel.h ..\win\Qt\qt_set.h \ + ..\win\Qt\qt_stat.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_streq.h \ + ..\win\Qt\qt_line.h ..\win\Qt\qt_yndlg.h ..\win\Qt\qt_str.h \ + $(INCL)\dlb.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_bind.cpp +$(O)qt_click.o: ..\win\Qt\qt_click.cpp $(HACK_H) ..\win\Qt\qt_click.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_click.cpp +$(O)qt_clust.o: ..\win\Qt\qt_clust.cpp ..\win\Qt\qt_clust.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_clust.cpp +$(O)qt_delay.o: ..\win\Qt\qt_delay.cpp $(HACK_H) ..\win\Qt\qt_delay.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_delay.cpp +$(O)qt_glyph.o: ..\win\Qt\qt_glyph.cpp $(HACK_H) $(INCL)\tile2x11.h \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_glyph.cpp +$(O)qt_icon.o: ..\win\Qt\qt_icon.cpp $(HACK_H) ..\win\Qt\qt_icon.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_icon.cpp +$(O)qt_inv.o: ..\win\Qt\qt_inv.cpp $(HACK_H) ..\win\Qt\qt_inv.h \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_inv.cpp +$(O)qt_key.o: ..\win\Qt\qt_key.cpp $(HACK_H) ..\win\Qt\qt_key.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_key.cpp +$(O)qt_line.o: ..\win\Qt\qt_line.cpp $(HACK_H) ..\win\Qt\qt_line.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_line.cpp +$(O)qt_main.o: ..\win\Qt\qt_main.cpp $(HACK_H) $(INCL)\patchlevel.h \ + ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h qt_main.moc \ + ..\win\Qt\qt_bind.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \ + ..\win\Qt\qt_key.h ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h \ + ..\win\Qt\qt_clust.h ..\win\Qt\qt_msg.h ..\win\Qt\qt_set.h \ + ..\win\Qt\qt_stat.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_str.h \ + qt_kde0.moc + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_main.cpp +$(O)qt_map.o: ..\win\Qt\qt_map.cpp $(HACK_H) ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h \ + ..\win\Qt\qt_clust.h qt_map.moc ..\win\Qt\qt_click.h \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_xpms.h ..\win\Qt\qt_set.h \ + ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_map.cpp +$(O)qt_menu.o: ..\win\Qt\qt_menu.cpp $(HACK_H) ..\win\Qt\qt_menu.h \ + ..\win\Qt\qt_win.h ..\win\Qt\qt_rip.h qt_menu.moc \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_streq.h \ + ..\win\Qt\qt_line.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_menu.cpp +$(O)qt_msg.o: ..\win\Qt\qt_msg.cpp $(HACK_H) ..\win\Qt\qt_msg.h ..\win\Qt\qt_win.h \ + qt_msg.moc ..\win\Qt\qt_map.h ..\win\Qt\qt_clust.h \ + ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_msg.cpp +$(O)qt_plsel.o: ..\win\Qt\qt_plsel.cpp $(HACK_H) ..\win\Qt\qt_plsel.h qt_plsel.moc \ + ..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_plsel.cpp +$(O)qt_rip.o: ..\win\Qt\qt_rip.cpp $(HACK_H) ..\win\Qt\qt_rip.h \ + ..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \ + ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_rip.cpp +$(O)qt_set.o: ..\win\Qt\qt_set.cpp $(HACK_H) ..\win\Qt\qt_set.h qt_set.moc \ + ..\win\Qt\qt_glyph.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_set.cpp +$(O)qt_stat.o: ..\win\Qt\qt_stat.cpp $(HACK_H) ..\win\Qt\qt_stat.h \ + ..\win\Qt\qt_win.h ..\win\Qt\qt_icon.h qt_stat.moc \ + ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h ..\win\Qt\qt_xpms.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_stat.cpp +$(O)qt_str.o: ..\win\Qt\qt_str.cpp ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_str.cpp +$(O)qt_streq.o: ..\win\Qt\qt_streq.cpp $(HACK_H) ..\win\Qt\qt_streq.h \ + ..\win\Qt\qt_line.h ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_streq.cpp +$(O)qt_svsel.o: ..\win\Qt\qt_svsel.cpp $(HACK_H) ..\win\Qt\qt_svsel.h \ + ..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \ + ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_svsel.cpp +$(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) ..\win\Qt\qt_win.h \ + ..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \ + ..\win\Qt\qt_click.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \ + ..\win\Qt\qt_key.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_map.h \ + ..\win\Qt\qt_clust.h ..\win\Qt\qt_menu.h ..\win\Qt\qt_rip.h \ + ..\win\Qt\qt_msg.h ..\win\Qt\qt_set.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_win.cpp +$(O)qt_xcmd.o: ..\win\Qt\qt_xcmd.cpp $(HACK_H) $(INCL)\func_tab.h \ + ..\win\Qt\qt_xcmd.h qt_xcmd.moc ..\win\Qt\qt_bind.h \ + ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h ..\win\Qt\qt_set.h \ + ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_xcmd.cpp +$(O)qt_yndlg.o: ..\win\Qt\qt_yndlg.cpp $(HACK_H) ..\win\Qt\qt_yndlg.h qt_yndlg.moc \ + ..\win\Qt\qt_str.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_yndlg.cpp +$(O)qt3_win.o: ..\win\Qt3\qt3_win.cpp $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\tile2x11.h \ - $(INCL)\qt_win.h $(INCL)\qt_clust.h $(INCL)\qt_kde0.h \ - $(INCL)\qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc -# $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_win.cpp -$(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h -# $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qt_clust.cpp -$(O)qttableview.o: ..\win\Qt\qttableview.cpp $(INCL)\qttableview.h -# $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt\qttableview.cpp + ..\win\Qt3\qt3_win.h ..\win\Qt3\qt3_clust.h \ + ..\win\Qt3\qt3_kde0.h ..\win\Qt3\qt3_xpms.h qt3_win.moc \ + qt3_kde0.moc qt3tableview.moc + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt3\qt3_win.cpp +$(O)qt3_clust.o: ..\win\Qt3\qt3_clust.cpp ..\win\Qt3\qt3_clust.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt3\qt3_clust.cpp +$(O)qt3tableview.o: ..\win\Qt3\qt3tableview.cpp ..\win\Qt3\qt3tableview.h + $(CXX) $(CXXFLAGS) -Fo$@ ..\win\Qt3\qt3tableview.cpp $(O)wc_chainin.o: ..\win\chain\wc_chainin.c $(HACK_H) -# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainin.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainin.c $(O)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H) -# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainout.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainout.c $(O)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) $(INCL)\func_tab.h -# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_trace.c +# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_trace.c $(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) $(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) $(O)bones.o: bones.c $(HACK_H) $(INCL)\lev.h $(O)botl.o: botl.c $(HACK_H) -$(O)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h +$(O)cmd.o: cmd.c $(HACK_H) $(INCL)\lev.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) $(O)display.o: display.c $(HACK_H) -$(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h +$(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(INCL)\patchlevel.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) @@ -1847,24 +2015,35 @@ $(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)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.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 \ + $(INCL)\lev.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) $(O)extralev.o: extralev.c $(HACK_H) -$(O)files.o: files.c $(HACK_H) $(INCL)\dlb.h #zlib.h +$(O)files.o: files.c $(HACK_H) $(INCL)\dlb.h $(INCL)\lev.h #zlib.h $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) $(O)invent.o: invent.c $(HACK_H) +$(O)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)\isaac64.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) $(O)mapglyph.o: mapglyph.c $(HACK_H) $(O)mcastu.o: mcastu.c $(HACK_H) +$(O)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \ + $(INCL)\monattk.h $(INCL)\monflag.h \ + $(INCL)\objclass.h $(INCL)\monsym.h \ + $(INCL)\artilist.h $(INCL)\dungeon.h $(INCL)\obj.h \ + $(INCL)\monst.h $(INCL)\mextra.h $(INCL)\you.h \ + $(INCL)\attrib.h $(INCL)\prop.h $(INCL)\skills.h \ + $(INCL)\context.h $(INCL)\flag.h $(INCL)\dlb.h \ + $(INCL)\patchlevel.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) @@ -1876,14 +2055,18 @@ $(O)mkroom.o: mkroom.c $(HACK_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)\color.h $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) $(O)muse.o: muse.c $(HACK_H) -$(O)music.o: music.c $(HACK_H) #interp.c -$(O)nhlua.o: nhlua.c $(HACK_H) -$(O)nhlsel.o: nhlsel.c $(HACK_H) -$(O)nhlobj.o: nhlobj.c $(HACK_H) +$(O)music.o: music.c $(HACK_H) +$(O)nhlua.o: nhlua.c $(HACK_H) $(INCL)\dlb.h +$(O)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)\sp_lev.h $(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 \ + $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h $(O)objnam.o: objnam.c $(HACK_H) $(O)options.o: options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \ $(HACK_H) $(INCL)\tcap.h @@ -1894,22 +2077,23 @@ $(O)polyself.o: polyself.c $(HACK_H) $(O)potion.o: potion.c $(HACK_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)quest.o: quest.c $(HACK_H) +$(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) $(O)region.o: region.c $(HACK_H) $(INCL)\lev.h $(O)restore.o: restore.c $(HACK_H) $(INCL)\lev.h $(INCL)\tcap.h $(O)rip.o: rip.c $(HACK_H) -$(O)rnd.o: rnd.c $(HACK_H) +$(O)rnd.o: rnd.c $(HACK_H) $(INCL)\isaac64.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)sfstruct.o: sfstruct.c $(HACK_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) -$(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\dlb.h $(INCL)\sp_lev.h +$(O)sp_lev.o: sp_lev.c $(HACK_H) $(INCL)\sp_lev.h $(O)spell.o: spell.c $(HACK_H) $(O)steal.o: steal.c $(HACK_H) $(O)steed.o: steed.c $(HACK_H) @@ -1922,12 +2106,14 @@ $(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) +$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h \ + $(INCL)\lev.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 +$(O)windows.o: windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h +$(O)wizard.o: wizard.c $(HACK_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/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj index 5f539114f..a95e3d8d5 100644 --- a/win/win32/vs2017/NetHack.vcxproj +++ b/win/win32/vs2017/NetHack.vcxproj @@ -262,7 +262,6 @@ - diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs2017/makedefs.vcxproj index accc0f964..00dab103c 100644 --- a/win/win32/vs2017/makedefs.vcxproj +++ b/win/win32/vs2017/makedefs.vcxproj @@ -46,7 +46,6 @@ -