remove some obsolete references from the outdated tree
untested, of course
This commit is contained in:
@@ -711,34 +711,14 @@ O = $(OBJ)\ # comment so \ isn't last char
|
||||
|
||||
U = $(UTIL)\ # comment so \ isn't last char
|
||||
|
||||
SPLEVDES = $(DAT)\Arch.des $(DAT)\Barb.des $(DAT)\bigroom.des \
|
||||
$(DAT)\castle.des $(DAT)\Caveman.des $(DAT)\endgame.des \
|
||||
$(DAT)\gehennom.des $(DAT)\Healer.des $(DAT)\Knight.des \
|
||||
$(DAT)\knox.des $(DAT)\Monk.des $(DAT)\medusa.des \
|
||||
$(DAT)\mines.des $(DAT)\oracle.des $(DAT)\Priest.des \
|
||||
$(DAT)\Ranger.des $(DAT)\Rogue.des $(DAT)\Samurai.des \
|
||||
$(DAT)\Tourist.des $(DAT)\tower.des $(DAT)\Valkyrie.des \
|
||||
$(DAT)\Wizard.des $(DAT)\yendor.des
|
||||
|
||||
#
|
||||
# Utility Objects.
|
||||
#
|
||||
|
||||
MAKESRC = $(U)makedefs.c
|
||||
|
||||
SPLEVSRC = $(U)lev_yacc.c $(U)lev_$(LEX).c $(U)lev_main.c $(U)panic.c
|
||||
|
||||
DGNCOMPSRC = $(U)dgn_yacc.c $(U)dgn_$(LEX).c $(U)dgn_main.c
|
||||
|
||||
MAKEOBJS = $(O)makedefs.o $(O)monst.o $(O)objects.o
|
||||
|
||||
SPLEVOBJS =$(O)lev_yacc.o $(O)lev_$(LEX).o $(O)lev_main.o \
|
||||
$(O)alloc.o $(O)decl.o $(O)drawing.o $(O)monst.o \
|
||||
$(O)objects.o $(O)panic.o $(O)stubvid.o
|
||||
|
||||
DGNCOMPOBJS =$(O)dgn_yacc.o $(O)dgn_$(LEX).o $(O)dgn_main.o \
|
||||
$(O)alloc.o $(O)panic.o
|
||||
|
||||
RECOVOBJS = $(O)recover.o
|
||||
|
||||
GIFREADERS =$(O)gifread.o $(O)alloc.o $(O)panic.o
|
||||
@@ -767,8 +747,8 @@ DLBOBJS = $(O)dlb_main.o $(O)dlb.o $(O)alloc.o $(O)panic.o
|
||||
|
||||
OBJ01 = $(O)alloc.o $(RANDOM) $(O)decl.o $(O)objects.o \
|
||||
$(O)muse.o $(O)display.o $(O)vision.o $(O)mapglyph.o \
|
||||
$(O)rect.o $(O)vis_tab.o $(O)monst.o $(O)wintty.o \
|
||||
$(O)files.o $(O)sys.o $(O)monstr.o $(O)minion.o \
|
||||
$(O)rect.o $(O)monst.o $(O)wintty.o \
|
||||
$(O)files.o $(O)sys.o $(O)minion.o \
|
||||
$(O)worm.o $(O)detect.o $(O)exper.o $(O)mplayer.o \
|
||||
$(O)uhitm.o $(O)pager.o $(O)windows.o $(O)quest.o \
|
||||
$(O)questpgr.o $(O)write.o $(O)drawing.o $(O)dokick.o \
|
||||
@@ -876,10 +856,8 @@ ARTIFACT_H = $(INCL)\artifact.h
|
||||
ARTILIST_H = $(INCL)\artilist.h
|
||||
COLOR_H = $(INCL)\color.h
|
||||
DATE_H = $(INCL)\date.h
|
||||
DGN_FILE_H = $(INCL)\dgn_file.h
|
||||
DLB_H = $(INCL)\dlb.h
|
||||
FUNC_TAB_H = $(INCL)\func_tab.h
|
||||
LEV_COMP_H = $(INCL)\lev_comp.h
|
||||
MAIL_H = $(INCL)\mail.h
|
||||
MFNDPOS_H = $(INCL)\mfndpos.h
|
||||
MONSYM_H = $(INCL)\monsym.h
|
||||
@@ -890,7 +868,6 @@ PROP_H = $(INCL)\prop.h
|
||||
QUEST_H = $(INCL)\quest.h
|
||||
SP_LEV_H = $(INCL)\sp_lev.h
|
||||
TERMCAP_H = $(INCL)\tcap.h
|
||||
VIS_TAB_H = $(INCL)\vis_tab.h
|
||||
WINTTY_H = $(INCL)\wintty.h
|
||||
|
||||
#
|
||||
@@ -935,14 +912,14 @@ install: $(GAME) install.tag
|
||||
|
||||
|
||||
install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
|
||||
$(DAT)\oracles $(DAT)\quest.dat $(DAT)\sp_lev.tag $(DLB)
|
||||
$(DAT)\oracles $(DAT)\quest.dat $(DLB)
|
||||
! IF ("$(USE_DLB)"=="Y")
|
||||
copy nhdat $(GAMEDIR)
|
||||
copy $(DAT)\license $(GAMEDIR)
|
||||
! ELSE
|
||||
copy $(DAT)\*. $(GAMEDIR)
|
||||
copy $(DAT)\*.dat $(GAMEDIR)
|
||||
copy $(DAT)\*.lev $(GAMEDIR)
|
||||
copy $(DAT)\*.lua $(GAMEDIR)
|
||||
copy $(MSYS)\msdoshlp.txt $(GAMEDIR)
|
||||
if exist $(GAMEDIR)\makefile del $(GAMEDIR)\makefile
|
||||
! ENDIF
|
||||
@@ -957,39 +934,8 @@ install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
|
||||
if exist *.tib copy *.tib $(GAMEDIR)
|
||||
echo install done > $@
|
||||
|
||||
$(DAT)\sp_lev.tag: $(U)utility.tag $(SPLEVDES)
|
||||
cd $(DAT)
|
||||
$(U)lev_comp bigroom.des
|
||||
$(U)lev_comp castle.des
|
||||
$(U)lev_comp endgame.des
|
||||
$(U)lev_comp gehennom.des
|
||||
$(U)lev_comp knox.des
|
||||
$(U)lev_comp mines.des
|
||||
$(U)lev_comp medusa.des
|
||||
$(U)lev_comp oracle.des
|
||||
$(U)lev_comp sokoban.des
|
||||
$(U)lev_comp tower.des
|
||||
$(U)lev_comp yendor.des
|
||||
$(U)lev_comp arch.des
|
||||
$(U)lev_comp barb.des
|
||||
$(U)lev_comp caveman.des
|
||||
$(U)lev_comp healer.des
|
||||
$(U)lev_comp knight.des
|
||||
$(U)lev_comp monk.des
|
||||
$(U)lev_comp priest.des
|
||||
$(U)lev_comp ranger.des
|
||||
$(U)lev_comp rogue.des
|
||||
$(U)lev_comp samurai.des
|
||||
$(U)lev_comp tourist.des
|
||||
$(U)lev_comp valkyrie.des
|
||||
$(U)lev_comp wizard.des
|
||||
cd $(SRC)
|
||||
echo sp_levs done > $(DAT)\sp_lev.tag
|
||||
|
||||
$(U)utility.tag: envchk $(INCL)\date.h $(INCL)\onames.h \
|
||||
$(INCL)\pm.h $(SRC)\monstr.c $(SRC)\vis_tab.c \
|
||||
$(U)lev_comp.exe $(VIS_TAB_H) $(U)dgn_comp.exe \
|
||||
$(U)recover.exe $(TILEUTIL)
|
||||
$(INCL)\pm.h $(U)recover.exe $(TILEUTIL)
|
||||
@echo utilities made >$@
|
||||
@echo utilities made.
|
||||
|
||||
@@ -1047,156 +993,6 @@ $(INCL)\pm.h : $(U)makedefs.exe
|
||||
#$(INCL)\trap.h : $(U)makedefs.exe
|
||||
# $(U)makedefs -t
|
||||
|
||||
$(SRC)\monstr.c: $(U)makedefs.exe
|
||||
$(U)makedefs -m
|
||||
|
||||
$(INCL)\vis_tab.h: $(U)makedefs.exe
|
||||
$(U)makedefs -z
|
||||
|
||||
$(SRC)\vis_tab.c: $(U)makedefs.exe
|
||||
$(U)makedefs -z
|
||||
|
||||
#
|
||||
# Level Compiler Stuff
|
||||
#
|
||||
|
||||
$(U)lev_comp.exe: $(SPLEVOBJS)
|
||||
@echo Linking $@...
|
||||
$(LINK) $(LFLAGSU) @&&!
|
||||
$(O)stubvid.o $(O)panic.o $(O)objects.o $(O)monst.o +
|
||||
$(O)drawing.o $(O)decl.o $(O)alloc.o $(O)lev_main.o +
|
||||
$(O)lev_$(LEX).o $(O)lev_yacc.o
|
||||
$@
|
||||
$(@B)
|
||||
$(BCMDL);
|
||||
!
|
||||
|
||||
$(O)lev_yacc.o: $(HACK_H) $(SP_LEV_H) $(INCL)\lev_comp.h $(U)lev_yacc.c
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
@$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)lev_yacc.c
|
||||
|
||||
$(O)lev_$(LEX).o: $(HACK_H) $(INCL)\lev_comp.h $(SP_LEV_H) \
|
||||
$(U)lev_$(LEX).c
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)lev_$(LEX).c
|
||||
|
||||
$(O)lev_main.o: $(U)lev_main.c $(HACK_H) $(SP_LEV_H)
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
@$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)lev_main.c
|
||||
|
||||
$(U)lev_yacc.c $(INCL)\lev_comp.h : $(U)lev_comp.y
|
||||
! IF "$(DO_YACC)"=="YACC_ACT"
|
||||
$(YACC) -d -l $(U)lev_comp.y
|
||||
copy $(YTABC) $(U)lev_yacc.c
|
||||
copy $(YTABH) $(INCL)\lev_comp.h
|
||||
@del $(YTABC)
|
||||
@del $(YTABH)
|
||||
! ELSE
|
||||
@echo.
|
||||
@echo $(U)lev_comp.y has changed.
|
||||
@echo To update $(U)lev_yacc.c and $(INCL)\lev_comp.h run $(YACC).
|
||||
@echo.
|
||||
@echo For now, we will copy the prebuilt lev_yacc.c
|
||||
@echo from $(SYS) to $(U)lev_yacc.c, and copy the prebuilt
|
||||
@echo lev_comp.h from $(SYS) to $(UTIL)\lev_comp.h
|
||||
@echo and use those.
|
||||
@echo.
|
||||
copy $(SYS)\lev_yacc.c $@ >nul
|
||||
touch $@
|
||||
copy $(SYS)\lev_comp.h $(INCL)\lev_comp.h >nul
|
||||
touch $(INCL)\lev_comp.h
|
||||
! ENDIF
|
||||
|
||||
$(U)lev_$(LEX).c: $(U)lev_comp.l
|
||||
! IF "$(DO_LEX)"=="LEX_ACT"
|
||||
$(LEX) $(FLEXSKEL) $(U)lev_comp.l
|
||||
copy $(LEXYYC) $@
|
||||
@del $(LEXYYC)
|
||||
! ELSE
|
||||
@echo.
|
||||
@echo $(U)lev_comp.l has changed. To update $@ run $(LEX).
|
||||
@echo.
|
||||
@echo For now, we will copy a prebuilt lev_lex.c
|
||||
@echo from $(SYS) to $@ and use it.
|
||||
@echo.
|
||||
copy $(SYS)\lev_lex.c $@ >nul
|
||||
touch $@
|
||||
! ENDIF
|
||||
|
||||
#
|
||||
# Dungeon Stuff
|
||||
#
|
||||
|
||||
$(U)dgn_comp.exe: $(DGNCOMPOBJS)
|
||||
@echo Linking $@...
|
||||
$(LINK) $(LFLAGSU) @&&!
|
||||
$(O)panic.o $(O)alloc.o $(O)dgn_main.o $(O)dgn_$(LEX).o +
|
||||
$(O)dgn_yacc.o
|
||||
$@
|
||||
$(@B)
|
||||
$(BCMDL);
|
||||
!
|
||||
|
||||
$(O)dgn_yacc.o: $(HACK_H) $(DGN_FILE_H) $(INCL)\dgn_comp.h \
|
||||
$(U)dgn_yacc.c
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
@$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)dgn_yacc.c
|
||||
|
||||
$(O)dgn_$(LEX).o: $(HACK_H) $(DGN_FILE_H) $(INCL)\dgn_comp.h \
|
||||
$(U)dgn_$(LEX).c
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
@$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)dgn_$(LEX).c
|
||||
|
||||
$(O)dgn_main.o: $(HACK_H) $(U)dgn_main.c
|
||||
@echo $(BCOPTS1) > $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
@$(CC) $(CFLAGSU) $(COBJNAM)$@ $(U)dgn_main.c
|
||||
|
||||
$(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y
|
||||
! IF "$(DO_YACC)"=="YACC_ACT"
|
||||
$(YACC) -d -l $(U)dgn_comp.y
|
||||
copy $(YTABC) $(U)dgn_yacc.c
|
||||
copy $(YTABH) $(INCL)\dgn_comp.h
|
||||
@del $(YTABC)
|
||||
@del $(YTABH)
|
||||
! ELSE
|
||||
@echo.
|
||||
@echo $(U)dgn_comp.y has changed. To update $@ and
|
||||
@echo $(INCL)\dgn_comp.h run $(YACC).
|
||||
@echo.
|
||||
@echo For now, we will copy the prebuilt dgn_yacc.c from
|
||||
@echo $(SYS) to $(U)dgn_yacc.c, and copy the prebuilt
|
||||
@echo dgn_comp.h from $(SYS) to $(INCL)\dgn_comp.h
|
||||
@echo and use those.
|
||||
@echo.
|
||||
copy $(SYS)\dgn_yacc.c $@ >nul
|
||||
touch $@
|
||||
copy $(SYS)\dgn_comp.h $(INCL)\dgn_comp.h >nul
|
||||
touch $(INCL)\dgn_comp.h
|
||||
! ENDIF
|
||||
|
||||
$(U)dgn_$(LEX).c: $(U)dgn_comp.l
|
||||
! IF "$(DO_LEX)"=="LEX_ACT"
|
||||
$(LEX) $(FLEXSKEL) $(U)dgn_comp.l
|
||||
copy $(LEXYYC) $@
|
||||
@del $(LEXYYC)
|
||||
! ELSE
|
||||
@echo.
|
||||
@echo $(U)dgn_comp.l has changed. To update $@ run $(LEX).
|
||||
@echo.
|
||||
@echo For now, we will copy a prebuilt dgn_lex.c
|
||||
@echo from $(SYS) to $@ and use it.
|
||||
@echo.
|
||||
copy $(SYS)\dgn_lex.c $@ >nul
|
||||
touch $@
|
||||
! ENDIF
|
||||
|
||||
|
||||
obj.tag:
|
||||
@if not exist $(O)*.* mkdir $(OBJ)
|
||||
@echo directory $(OBJ) created
|
||||
@@ -1373,7 +1169,7 @@ nhdat: $(U)dlb_main.exe
|
||||
@echo dungeon >>dlb.lst
|
||||
@echo license >>dlb.lst
|
||||
@echo msdoshlp.txt >>dlb.lst
|
||||
@for %%N in (*.lev) do echo %%N >>dlb.lst
|
||||
@for %%N in (*.lua) do echo %%N >>dlb.lst
|
||||
$(U)dlb_main cvIf dlb.lst $(SRC)\nhdat
|
||||
@cd $(SRC)
|
||||
|
||||
@@ -1394,8 +1190,6 @@ spotless: clean
|
||||
if exist $(DATE_H) del $(DATE_H)
|
||||
if exist $(INCL)\onames.h del $(INCL)\onames.h
|
||||
if exist $(INCL)\pm.h del $(INCL)\pm.h
|
||||
if exist $(VIS_TAB_H) del $(VIS_TAB_H)
|
||||
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
|
||||
if exist $(SRC)\tile.c del $(SRC)\tile.c
|
||||
if exist $(DAT)\rumors del $(DAT)\rumors
|
||||
if exist $(DAT)\data del $(DAT)\data
|
||||
@@ -1404,11 +1198,6 @@ spotless: clean
|
||||
if exist $(DAT)\options del $(DAT)\options
|
||||
if exist $(DAT)\oracles del $(DAT)\oracles
|
||||
if exist $(DAT)\rumors del $(DAT)\rumors
|
||||
if exist $(DAT)\quest.dat del $(DAT)\quest.dat
|
||||
if exist $(DAT)\*.lev del $(DAT)\*.lev
|
||||
if exist $(DAT)\sp_lev.tag del $(DAT)\sp_lev.tag
|
||||
if exist $(SRC)\monstr.c del $(SRC)\monstr.c
|
||||
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
|
||||
if exist $(SRC)\$(PLANAR_TIB) del $(SRC)\$(PLANAR_TIB)
|
||||
if exist $(SRC)\$(OVERVIEW_TIB) del $(SRC)\$(OVERVIEW_TIB)
|
||||
if exist $(U)recover.exe del $(U)recover.exe
|
||||
@@ -1422,8 +1211,6 @@ clean:
|
||||
if exist $(O)*.b del $(O)*.b
|
||||
if exist $(U)utility.tag del $(U)utility.tag
|
||||
if exist $(U)makedefs.exe del $(U)makedefs.exe
|
||||
if exist $(U)lev_comp.exe del $(U)lev_comp.exe
|
||||
if exist $(U)dgn_comp.exe del $(U)dgn_comp.exe
|
||||
if exist $(U)dlb_main.exe del $(U)dlb_main.exe
|
||||
if exist $(SRC)\*.lnk del $(SRC)\*.lnk
|
||||
if exist $(SRC)\*.map del $(SRC)\*.map
|
||||
@@ -1825,11 +1612,6 @@ $(O)monst.o: $(SRC)\monst.c $(CONFIG_H) $(PERMONST_H) $(MONSYM_H) \
|
||||
@echo $(BCOPTS1) >> $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
$(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\monst.c
|
||||
$(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H)
|
||||
@type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG)
|
||||
@echo $(BCOPTS1) >> $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
$(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\monstr.c
|
||||
$(O)mplayer.o: $(PCHO) $(SRC)\mplayer.c $(HACK_H)
|
||||
$(O)muse.o: $(PCHO) $(SRC)\muse.c $(HACK_H)
|
||||
$(O)music.o: $(PCHO) $(SRC)\music.c $(HACK_H)
|
||||
@@ -1873,12 +1655,7 @@ $(O)topten.o: $(PCHO) $(SRC)\topten.c $(HACK_H) $(DLB_H) $(PATCHLEVEL_H)
|
||||
$(O)u_init.o: $(PCHO) $(SRC)\u_init.c $(HACK_H)
|
||||
$(O)uhitm.o: $(PCHO) $(SRC)\uhitm.c $(HACK_H)
|
||||
$(O)version.o: $(PCHO) $(SRC)\version.c $(HACK_H) $(PATCHLEVEL_H)
|
||||
$(O)vision.o: $(PCHO) $(SRC)\vision.c $(HACK_H) $(VIS_TAB_H)
|
||||
$(O)vis_tab.o: $(SRC)\vis_tab.c $(HACK_H) $(VIS_TAB_H)
|
||||
@type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG)
|
||||
@echo $(BCOPTS1) >> $(VROOMMCFG)
|
||||
@echo $(BCOPTS2) >> $(VROOMMCFG)
|
||||
$(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\vis_tab.c
|
||||
$(O)vision.o: $(PCHO) $(SRC)\vision.c
|
||||
$(O)wield.o: $(PCHO) $(SRC)\wield.c $(HACK_H)
|
||||
$(O)windows.o: $(PCHO) $(SRC)\windows.c $(HACK_H) $(WINTTY_H)
|
||||
$(O)worm.o: $(PCHO) $(SRC)\worm.c $(HACK_H)
|
||||
|
||||
Reference in New Issue
Block a user