nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

include/qtext.h is an empty header so just get rid of it

Browse Source
This commit is contained in:
nhmall
2019-12-14 12:31:29 -05:00
parent 2dad98d55e
commit f4720edfbf
23 changed files with 406 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sys/msdos/Makefile.BC
View File

@@ -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

8
sys/msdos/Makefile.GCC
View File

@@ -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)

8
sys/msdos/Makefile.MSC
View File

@@ -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)

43
sys/msdos/Makefile1.cross
View File

@@ -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

39
sys/msdos/Makefile2.cross
View File

@@ -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)