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