Clean up the visual studio express build further

Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/
This commit is contained in:
nethack.allison
2010-09-05 14:22:20 +00:00
parent 0fa41c557d
commit aac052f0f0
15 changed files with 116 additions and 139 deletions

View File

@@ -1,6 +1,5 @@
# NetHack 3.5 Makefile.bcc $Date$ $Revision$
# SCCS Id: @(#)Makefile.bcc 3.5 $Date$
# Copyright (c) NetHack PC Development Team 1993-2006
# Copyright (c) NetHack PC Development Team 1993-2010
#
#
# IMPORTANT NOTE: This Makefile has not been tested for 3.5.x.
@@ -565,37 +564,37 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(DAT)\rogue.des $(DAT)\samurai.des $(DAT)\sokoban.des \
$(DAT)\tourist.des $(DAT)\valkyrie.des $(DAT)\wizard.des
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
$(U)levcomp bigroom.des
$(U)levcomp castle.des
$(U)levcomp endgame.des
$(U)levcomp gehennom.des
$(U)levcomp knox.des
$(U)levcomp mines.des
$(U)levcomp medusa.des
$(U)levcomp oracle.des
$(U)levcomp sokoban.des
$(U)levcomp tower.des
$(U)levcomp yendor.des
$(U)levcomp arch.des
$(U)levcomp barb.des
$(U)levcomp caveman.des
$(U)levcomp healer.des
$(U)levcomp knight.des
$(U)levcomp monk.des
$(U)levcomp priest.des
$(U)levcomp ranger.des
$(U)levcomp rogue.des
$(U)levcomp samurai.des
$(U)levcomp tourist.des
$(U)levcomp valkyrie.des
$(U)levcomp wizard.des
cd $(SRC)
echo sp_levs done > $(O)sp_lev.tag
$(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 $(TILEUTIL16)
$(U)levcomp.exe $(INCL)\vis_tab.h \
$(U)dgncomp.exe $(TILEUTIL16)
@echo utilities made >$@
@echo utilities made.
@@ -793,7 +792,7 @@ $(WIN32)\splash.bmp: $(U)uudecode.exe $(WIN32)\splash.uu
LEVCFLAGS=$(cflags) -DWIN32 -D_WIN32 -D_MT -I..\include $(cdebug) -DDLB
$(U)lev_comp.exe: $(SPLEVOBJS) $(SRC)\uuid.lib
$(U)levcomp.exe: $(SPLEVOBJS) $(SRC)\uuid.lib
@echo Linking $@...
@$(link) $(LFLAGSU) $(startobj) $(SPLEVOBJS), $@,,$(libsmt)
@@ -849,7 +848,7 @@ $(U)lev_$(LEX).c: $(U)lev_comp.l
# Dungeon Compiler Stuff
#==========================================
$(U)dgn_comp.exe: $(DGNCOMPOBJS) $(SRC)\uuid.lib
$(U)dgncomp.exe: $(DGNCOMPOBJS) $(SRC)\uuid.lib
@echo Linking $@...
@$(link) $(LFLAGSU) $(startobj) $(DGNCOMPOBJS), $@,,$(libsmt)
@@ -1085,8 +1084,8 @@ clean:
if exist $(O)*.o del $(O)*.o
if exist $(O)utility.tag del $(O)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)levcomp.exe del $(U)levcomp.exe
if exist $(U)dgncomp.exe del $(U)dgncomp.exe
if exist $(SRC)\*.lnk del $(SRC)\*.lnk
if exist $(SRC)\*.map del $(SRC)\*.map
if exist $(TILEBMP16) del $(TILEBMP16)
@@ -1114,7 +1113,7 @@ $(DAT)\oracles: $(O)utility.tag $(DAT)\oracles.txt
$(DAT)\dungeon: $(O)utility.tag $(DAT)\dungeon.def
$(U)makedefs -e
cd $(DAT)
$(U)dgn_comp dungeon.pdf
$(U)dgncomp.exe dungeon.pdf
cd $(SRC)
#

View File

@@ -1,6 +1,5 @@
# NetHack 3.5 Makefile.gcc $Date$ $Revision$
# SCCS Id: @(#)Makefile.gcc 3.5 $Date$
# Copyright (c) NetHack PC Development Team 1993-2006
# Copyright (c) NetHack PC Development Team 1993-2010
#
# NetHack 3.5.x Makefile for MinGW
#
@@ -526,37 +525,37 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \
$(DAT)/monk.des $(DAT)/priest.des $(DAT)/ranger.des \
$(DAT)/rogue.des $(DAT)/samurai.des $(DAT)/sokoban.des \
$(DAT)/tourist.des $(DAT)/valkyrie.des $(DAT)/wizard.des
$(subst /,\,$(U)lev_comp $(DAT)/bigroom.des)
$(subst /,\,$(U)lev_comp $(DAT)/castle.des)
$(subst /,\,$(U)lev_comp $(DAT)/endgame.des)
$(subst /,\,$(U)lev_comp $(DAT)/gehennom.des)
$(subst /,\,$(U)lev_comp $(DAT)/knox.des)
$(subst /,\,$(U)lev_comp $(DAT)/mines.des)
$(subst /,\,$(U)lev_comp $(DAT)/medusa.des)
$(subst /,\,$(U)lev_comp $(DAT)/oracle.des)
$(subst /,\,$(U)lev_comp $(DAT)/sokoban.des)
$(subst /,\,$(U)lev_comp $(DAT)/tower.des)
$(subst /,\,$(U)lev_comp $(DAT)/yendor.des)
$(subst /,\,$(U)lev_comp $(DAT)/arch.des)
$(subst /,\,$(U)lev_comp $(DAT)/barb.des)
$(subst /,\,$(U)lev_comp $(DAT)/caveman.des)
$(subst /,\,$(U)lev_comp $(DAT)/healer.des)
$(subst /,\,$(U)lev_comp $(DAT)/knight.des)
$(subst /,\,$(U)lev_comp $(DAT)/monk.des)
$(subst /,\,$(U)lev_comp $(DAT)/priest.des)
$(subst /,\,$(U)lev_comp $(DAT)/ranger.des)
$(subst /,\,$(U)lev_comp $(DAT)/rogue.des)
$(subst /,\,$(U)lev_comp $(DAT)/samurai.des)
$(subst /,\,$(U)lev_comp $(DAT)/tourist.des)
$(subst /,\,$(U)lev_comp $(DAT)/valkyrie.des)
$(subst /,\,$(U)lev_comp $(DAT)/wizard.des)
$(subst /,\,$(U)levcomp $(DAT)/bigroom.des)
$(subst /,\,$(U)levcomp $(DAT)/castle.des)
$(subst /,\,$(U)levcomp $(DAT)/endgame.des)
$(subst /,\,$(U)levcomp $(DAT)/gehennom.des)
$(subst /,\,$(U)levcomp $(DAT)/knox.des)
$(subst /,\,$(U)levcomp $(DAT)/mines.des)
$(subst /,\,$(U)levcomp $(DAT)/medusa.des)
$(subst /,\,$(U)levcomp $(DAT)/oracle.des)
$(subst /,\,$(U)levcomp $(DAT)/sokoban.des)
$(subst /,\,$(U)levcomp $(DAT)/tower.des)
$(subst /,\,$(U)levcomp $(DAT)/yendor.des)
$(subst /,\,$(U)levcomp $(DAT)/arch.des)
$(subst /,\,$(U)levcomp $(DAT)/barb.des)
$(subst /,\,$(U)levcomp $(DAT)/caveman.des)
$(subst /,\,$(U)levcomp $(DAT)/healer.des)
$(subst /,\,$(U)levcomp $(DAT)/knight.des)
$(subst /,\,$(U)levcomp $(DAT)/monk.des)
$(subst /,\,$(U)levcomp $(DAT)/priest.des)
$(subst /,\,$(U)levcomp $(DAT)/ranger.des)
$(subst /,\,$(U)levcomp $(DAT)/rogue.des)
$(subst /,\,$(U)levcomp $(DAT)/samurai.des)
$(subst /,\,$(U)levcomp $(DAT)/tourist.des)
$(subst /,\,$(U)levcomp $(DAT)/valkyrie.des)
$(subst /,\,$(U)levcomp $(DAT)/wizard.des)
$(subst /,\,copy *.lev $(DAT))
$(subst /,\,del *.lev)
$(subst /,\,echo sp_levs done > $(O)sp_lev.tag)
$(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 $(TILEUTIL16)
$(SRC)/monstr.c $(SRC)/vis_tab.c $(U)levcomp.exe $(INCL)/vis_tab.h \
$(U)dgncomp.exe $(TILEUTIL16)
$(subst /,\,@echo utilities made >$@)
@echo utilities made.
@@ -731,7 +730,7 @@ $(WIN32)/splash.bmp: $(U)uudecode.exe $(WIN32)/splash.uu
LEVCFLAGS=$(cflags) -c -DWIN32 -D_WIN32 -I../include $(cdebug) -DDLB
$(U)lev_comp.exe: $(SPLEVOBJS)
$(U)levcomp.exe: $(SPLEVOBJS)
@echo Linking $@...
@$(link) $(LFLAGSU) -o$@ $(SPLEVOBJS)
@@ -784,7 +783,7 @@ endif
# Dungeon Compiler Stuff
#==========================================
$(U)dgn_comp.exe: $(DGNCOMPOBJS)
$(U)dgncomp.exe: $(DGNCOMPOBJS)
@echo Linking $@...
@$(link) $(LFLAGSU) -o$@ $(DGNCOMPOBJS)
@@ -1050,8 +1049,8 @@ clean:
$(subst /,\,if exist $(O)*.o del $(O)*.o)
$(subst /,\,if exist $(O)utility.tag del $(O)utility.tag)
$(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)
$(subst /,\,if exist $(U)levcomp.exe del $(U)levcomp.exe)
$(subst /,\,if exist $(U)dgncomp.exe del $(U)dgncomp.exe)
$(subst /,\,if exist $(SRC)/*.lnk del $(SRC)/*.lnk)
$(subst /,\,if exist $(SRC)/*.map del $(SRC)/*.map)
$(subst /,\,if exist $(TILEBMP16) del $(TILEBMP16))
@@ -1079,7 +1078,7 @@ $(DAT)/oracles: $(O)utility.tag $(DAT)/oracles.txt
$(DAT)/dungeon: $(O)utility.tag $(DAT)/dungeon.def
$(subst /,\,$(U)makedefs -e)
$(subst /,\,$(U)dgn_comp $(DAT)/dungeon.pdf)
$(subst /,\,$(U)dgncomp $(DAT)/dungeon.pdf)
#
# NT dependencies

View File

@@ -1,6 +1,5 @@
# NetHack 3.5 Makefile.msc $Date$ $Revision$
# SCCS Id: @(#)Makefile.msc 3.5 $Date$
# Copyright (c) NetHack PC Development Team 1993-2007
# Copyright (c) NetHack PC Development Team 1993-2010
#
# NetHack 3.5.x Makefile for MS Visual C++
#
@@ -535,37 +534,37 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des $(DAT)\castle.des \
$(DAT)\rogue.des $(DAT)\samurai.des $(DAT)\sokoban.des \
$(DAT)\tourist.des $(DAT)\valkyrie.des $(DAT)\wizard.des
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
$(U)levcomp bigroom.des
$(U)levcomp castle.des
$(U)levcomp endgame.des
$(U)levcomp gehennom.des
$(U)levcomp knox.des
$(U)levcomp mines.des
$(U)levcomp medusa.des
$(U)levcomp oracle.des
$(U)levcomp sokoban.des
$(U)levcomp tower.des
$(U)levcomp yendor.des
$(U)levcomp arch.des
$(U)levcomp barb.des
$(U)levcomp caveman.des
$(U)levcomp healer.des
$(U)levcomp knight.des
$(U)levcomp monk.des
$(U)levcomp priest.des
$(U)levcomp ranger.des
$(U)levcomp rogue.des
$(U)levcomp samurai.des
$(U)levcomp tourist.des
$(U)levcomp valkyrie.des
$(U)levcomp wizard.des
cd $(SRC)
echo sp_levs done > $(O)sp_lev.tag
$(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)levcomp.exe $(INCL)\vis_tab.h \
$(U)dgncomp.exe
@echo utilities made >$@
@echo utilities made.
@@ -778,7 +777,7 @@ $(WIN32)\splash.bmp: $(U)uudecode.exe $(WIN32)\splash.uu
LEVCFLAGS=-c -nologo -DWINVER=0x0400 -DWIN32 -D_WIN32 \
-D_MT -MT -I..\include -nologo -Z7 -Od -DDLB
$(U)lev_comp.exe: $(SPLEVOBJS)
$(U)levcomp.exe: $(SPLEVOBJS)
@echo Linking $@...
@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
$(SPLEVOBJS:^ =^
@@ -837,7 +836,7 @@ $(U)lev_$(LEX).c: $(U)lev_comp.l
# Dungeon Compiler Stuff
#==========================================
$(U)dgn_comp.exe: $(DGNCOMPOBJS)
$(U)dgncomp.exe: $(DGNCOMPOBJS)
@echo Linking $@...
@$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
$(DGNCOMPOBJS:^ =^
@@ -1152,8 +1151,8 @@ clean:
if exist $(O)*.o del $(O)*.o
if exist $(O)utility.tag del $(O)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)levcomp.exe del $(U)levcomp.exe
if exist $(U)dgncomp.exe del $(U)dgncomp.exe
if exist $(SRC)\*.lnk del $(SRC)\*.lnk
if exist $(SRC)\*.map del $(SRC)\*.map
if exist $(O)install.tag del $(O)install.tag
@@ -1185,7 +1184,7 @@ $(DAT)\oracles: $(O)utility.tag $(DAT)\oracles.txt
$(DAT)\dungeon: $(O)utility.tag $(DAT)\dungeon.def
$(U)makedefs -e
cd $(DAT)
$(U)dgn_comp dungeon.pdf
$(U)dgncomp dungeon.pdf
cd $(SRC)
#

View File

@@ -1,5 +1,5 @@
@REM SCCS Id: @(#)nhsetup.bat 3.5 $Date$
@REM Copyright (c) NetHack PC Development Team 1993-2006
@REM NetHack 3.5 nhsetup.bat $Date$ $Revision$ */
@REM Copyright (c) NetHack PC Development Team 1993-2010
@REM NetHack may be freely redistributed. See license for details.
@REM Win32 setup batch file, see Install.nt for details
@REM