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

win32 and msdos recover

Browse Source 
Since the ports have SELF_RECOVER defined,
remove the build of recover.exe from the default steps.
You must explicitly use 'make recover' now.
This commit is contained in:
nethack.allison
2003-02-17 23:56:40 +00:00
parent 5e6bed70b8
commit 73d357a647
4 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sys/msdos/Makefile.GCC
View File

@@ -380,11 +380,6 @@ DJ1 = $(dir $(DJGPP))
CWSDPMI = $(subst /,\,$(DJ1))bin\CWSDPMI.*
endif
ifdef BUILDRECOVER
RECOVEREXE = $(U)RECOVER.EXE
RECOVEROBJ = $(O)RECOVER.O
endif
#==========================================
# Primary Targets.
#==========================================
@@ -402,12 +397,16 @@ util: $(O)utility.tag
$(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \
$(INCL)/pm.h monstr.c vis_tab.c \
$(U)lev_comp.exe $(U)dgn_comp.exe $(RECOVEREXE) $(TILEUTIL)
$(U)lev_comp.exe $(U)dgn_comp.exe $(TILEUTIL)
$(subst /,\,echo utilities made > $@)
tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
@echo Optional tile development utilities are up to date.
recover: $(U)recover.exe
@$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
@$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR))
$(O)install.tag: $(O)dat.tag $(GAMEFILE)
ifeq ($(USE_DLB),Y)
@$(subst /,\,copy $(DAT)/nhdat $(GAMEDIR))
@@ -425,13 +424,7 @@ endif
@$(subst /,\,if exist $(DAT)/*.tib copy $(DAT)/*.tib $(GAMEDIR))
@$(subst /,\,copy $(SSHR)/NetHack.cnf $(GAMEDIR)/defaults.nh)
@$(subst /,\,copy $(MSYS)/NHAccess.nh $(GAMEDIR))
ifdef BUILDRECOVER
@$(subst /,\,copy $(RECOVEREXE) $(GAMEDIR))
endif
@$(subst /,\,copy $(DOC)/guidebo*.txt $(GAMEDIR))
ifdef BUILDRECOVER
@$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR))
endif
@$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR))
ifdef CWSDPMI
@$(subst /,\,if exist $(CWSDPMI) copy $(CWSDPMI) $(GAMEDIR))
@@ -504,9 +497,7 @@ spotless: clean
$(subst /,\,if exist $(U)makedefs.exe del $(U)makedefs.exe)
$(subst /,\,if exist $(U)lev_comp.exe del $(U)lev_comp.exe)
$(subst /,\,if exist $(U)dgn_comp.exe del $(U)dgn_comp.exe)
ifdef BUILDRECOVER
$(subst /,\,if exist $(RECOVEREXE) del $(RECOVEREXE))
endif
$(subst /,\,if exist $(U)recover.exe del $(U)recover.exe)
$(subst /,\,if exist $(U)tilemap.exe del $(U)tilemap.exe)
$(subst /,\,if exist $(U)tile2bin.exe del $(U)tile2bin.exe)
$(subst /,\,if exist $(U)til2bin2.exe del $(U)til2bin2.exe)
@@ -716,13 +707,11 @@ endif
# Recover Utility
#==========================================
ifdef BUILDRECOVER
$(U)recover.exe: $(RECOVOBJS)
$(LINK) $(LFLAGS) -o$@ $(O)recover.o
$(O)recover.o: $(CONFIG_H) $(U)recover.c
$(CC) $(cflags) -o$@ $(U)recover.c
endif
#==========================================
# Header file moves required for tile support

12
sys/winnt/Makefile.bcc
View File

@@ -525,15 +525,17 @@ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
! ENDIF
if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt
if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
@if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb
@if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space
-copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh
copy $(U)recover.exe $(GAMEDIR)
echo install done > $@
# copy $(NTSYS)\winnt.hlp $(GAMEDIR)
recover: $(U)recover.exe
if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)
if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
$(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des \
$(DAT)\medusa.des $(DAT)\oracle.des $(DAT)\tower.des \
@@ -573,7 +575,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
$(SRC)\monstr.c $(SRC)\vis_tab.c \
$(U)lev_comp.exe $(INCL)\vis_tab.h \
$(U)dgn_comp.exe $(U)recover.exe $(TILEUTIL16)
$(U)dgn_comp.exe $(TILEUTIL16)
@echo utilities made >$@
@echo utilities made.
@@ -894,11 +896,11 @@ nhdat: $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
#==========================================
$(U)recover.exe: $(RECOVOBJS) $(SRC)\uuid.lib
@$(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt)
$(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt)
$(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h
@$(cc) $(CFLAGSU) -o$@ $(U)recover.c
$(cc) $(CFLAGSU) -o$@ $(U)recover.c
#==========================================
# Tile Mapping

13
sys/winnt/Makefile.gcc
View File

@@ -506,15 +506,17 @@ else
endif
$(subst /,\,if exist $(DOC)/guidebook.txt copy $(DOC)/guidebook.txt $(GAMEDIR)/Guidebook.txt)
$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR)/NetHack.txt)
$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt)
$(subst /,\,@if exist $(SRC)/$(GAME).PDB copy $(SRC)/$(GAME).pdb $(GAMEDIR)/$(GAME).pdb)
$(subst /,\,@if exist $(GAMEDIR)/$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)/$(GAME).pdb to conserve space)
$(subst /,\,-copy $(NTSYS)/defaults.nh $(GAMEDIR)/defaults.nh)
$(subst /,\,copy $(U)recover.exe $(GAMEDIR))
$(subst /,\,echo install done > $@)
# copy $(NTSYS)/winnt.hlp $(GAMEDIR)
recover: $(U)recover.exe
$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt)
$(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \
$(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \
$(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \
@@ -554,7 +556,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \
$(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
$(SRC)/monstr.c $(SRC)/vis_tab.c \
$(U)lev_comp.exe $(INCL)/vis_tab.h \
$(U)dgn_comp.exe $(U)recover.exe $(TILEUTIL16)
$(U)dgn_comp.exe $(TILEUTIL16)
$(subst /,\,@echo utilities made >$@)
@echo utilities made.
@@ -875,11 +877,10 @@ nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
#==========================================
$(U)recover.exe: $(RECOVOBJS)
@$(link) $(LFLAGSU) -o$@ $(RECOVOBJS)
$(link) $(LFLAGSU) -o$@ $(RECOVOBJS)
$(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)/win32api.h
@$(cc) $(CFLAGSU) -o$@ $(U)recover.c
$(cc) $(CFLAGSU) -o$@ $(U)recover.c
#==========================================
# Tile Mapping

12
sys/winnt/Makefile.msc
View File

@@ -477,15 +477,17 @@ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
! ENDIF
if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt
if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
@if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb
@if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space
-copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh
copy $(U)recover.exe $(GAMEDIR)
echo install done > $@
# copy $(NTSYS)\winnt.hlp $(GAMEDIR)
recover: $(U)recover.exe
if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)
if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
$(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des \
$(DAT)\medusa.des $(DAT)\oracle.des $(DAT)\tower.des \
@@ -525,7 +527,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
$(SRC)\monstr.c $(SRC)\vis_tab.c \
$(U)lev_comp.exe $(INCL)\vis_tab.h \
$(U)dgn_comp.exe $(U)recover.exe
$(U)dgn_comp.exe
@echo utilities made >$@
@echo utilities made.
@@ -884,10 +886,10 @@ nhdat: $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
#==========================================
$(U)recover.exe: $(RECOVOBJS)
@$(link) $(LFLAGSU) -out:$@ $(RECOVOBJS)
$(link) $(LFLAGSU) -out:$@ $(RECOVOBJS)
$(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h
@$(CC) $(CFLAGSU) -Fo$@ $(U)recover.c
$(CC) $(CFLAGSU) -Fo$@ $(U)recover.c
#==========================================
# Tile Mapping