win32 and msdos recover
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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user