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/

diff --git a/include/extern.h b/include/extern.h
index 0dd3580b334ac3dbdba7c046661bdc91cf0c25db..5ef58a86f0c2032287110dedcea561d1226fe087 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -2120,9 +2120,7 @@ E void FDECL(play_sound_for_message, (const char *));
 
 /* ### sys.c ### */
 
-#ifdef SYSCF
 E void FDECL(sysopt_seduce_set,(int));
-#endif
 
 /* ### sys/msdos/sound.c ### */
 

diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc
index 9cfbc62a6a49e27a73a4edabba104845557e6247..69fd27d5aa11f2f25006aee7560d9b0b0a2ecaae 100644 (file)
--- a/sys/winnt/Makefile.bcc
+++ b/sys/winnt/Makefile.bcc
@@ -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)
 
 #

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 7c500a3e83308e7e0f43a4b652a9ff2a5d3fa7a5..44a7c1d4efac3a8d0ab060c29e76c8ec16a19bdc 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -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

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 7bc11972f6ac77bfb3377a89b5b07f272ae72f8c..4202ef9464b7c7694456c049d89bbdccaf083d80 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -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)
 
 #

diff --git a/sys/winnt/nhsetup.bat b/sys/winnt/nhsetup.bat
index a4f7a481af916987bfd0a7fb0a9d6b238e3c6c1e..c1324c35d4723443ff0e15611e4ccfee6f3751fe 100755 (executable)
--- a/sys/winnt/nhsetup.bat
+++ b/sys/winnt/nhsetup.bat
@@ -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

diff --git a/win/win32/NetHackW.vcxproj b/win/win32/NetHackW.vcxproj
index cd4dd1a11156b88e33d866e2facc3ec86c1720c5..e89d9bbbae55a8953780b683a094293c9168a695 100644 (file)
--- a/win/win32/NetHackW.vcxproj
+++ b/win/win32/NetHackW.vcxproj
@@ -81,7 +81,6 @@
     <Link>
       <AdditionalOptions>/MAPINFO:EXPORTS %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Release/NetHackW.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Release/NetHackW.pdb</ProgramDatabaseFile>
@@ -140,7 +139,6 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Debug/NetHackW.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/NetHackW.pdb</ProgramDatabaseFile>

diff --git a/win/win32/dgncomp.vcxproj b/win/win32/dgncomp.vcxproj
index efd2b35719d3766a100f951d50548f67ad808b4c..943d2560e17ad70084f0c8a790eaea92236f67a4 100644 (file)
--- a/win/win32/dgncomp.vcxproj
+++ b/win/win32/dgncomp.vcxproj
@@ -71,9 +71,8 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\dgn_comp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\..\util/dgn_comp.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\util/dgncomp.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -89,8 +88,8 @@
       <Command>echo Building dungeon
 echo chdir ..\dat
 chdir ..\dat
-echo ..\util\dgn_comp.exe dungeon.pdf
-..\util\dgn_comp.exe dungeon.pdf
+echo ..\util\dgncomp.exe dungeon.pdf
+..\util\dgncomp.exe dungeon.pdf
 echo chdir ..\build
 chdir ..\build
 </Command>
@@ -122,10 +121,9 @@ chdir ..\build
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\dgn_comp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\util/dgn_comp.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\util/dgncomp.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -141,8 +139,8 @@ chdir ..\build
       <Command>echo Building dungeon
 echo chdir ..\dat
 chdir ..\dat
-echo ..\util\dgn_comp.exe dungeon.pdf
-..\util\dgn_comp.exe dungeon.pdf
+echo ..\util\dgncomp.exe dungeon.pdf
+..\util\dgncomp.exe dungeon.pdf
 echo chdir ..\build
 chdir ..\build
 </Command>

diff --git a/win/win32/dlb_main.vcxproj b/win/win32/dlb_main.vcxproj
index 77493264950fd963663a0ec185b75fdadd299b72..49525bbfa2ca4d06df68ad1772f0db2351625fe4 100644 (file)
--- a/win/win32/dlb_main.vcxproj
+++ b/win/win32/dlb_main.vcxproj
@@ -38,10 +38,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
   </PropertyGroup>
@@ -71,7 +71,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\dlb_main.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/dlb_main.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -141,7 +140,6 @@ if NOT exist ..\binary\*.* mkdir ..\binary
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\dlb_main.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/dlb_main.pdb</ProgramDatabaseFile>

diff --git a/win/win32/levcomp.vcxproj b/win/win32/levcomp.vcxproj
index 6c343a7ec715e3f09ff3dd9720664481ae014571..cb37a0336550846c51b73d967714d38ae6ef71f3 100644 (file)
--- a/win/win32/levcomp.vcxproj
+++ b/win/win32/levcomp.vcxproj
@@ -71,7 +71,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\..\util/levcomp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\..\util/levcomp.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -168,7 +167,6 @@ chdir ..\build
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\..\util/levcomp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\..\util/levcomp.pdb</ProgramDatabaseFile>

diff --git a/win/win32/makedefs.vcxproj b/win/win32/makedefs.vcxproj
index ee5d58166a84aaa411684a348748df6ebf6ff749..52df8c372c441de61b9bf9f46c4327e4e404ff58 100644 (file)
--- a/win/win32/makedefs.vcxproj
+++ b/win/win32/makedefs.vcxproj
@@ -71,7 +71,6 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\..\util/makedefs.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\..\util/makedefs.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -149,7 +148,6 @@ copy ..\win\share\tilemap.c ..\win\share\tiletxt.c
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\..\util/makedefs.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\..\util/makedefs.pdb</ProgramDatabaseFile>

diff --git a/win/win32/recover.vcxproj b/win/win32/recover.vcxproj
index 4227685709e1934ac625b345694cb42aff773ef7..ce62cfddacbe92011157356b35f4d24a921e05e2 100644 (file)
--- a/win/win32/recover.vcxproj
+++ b/win/win32/recover.vcxproj
@@ -38,10 +38,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   </PropertyGroup>
@@ -71,7 +71,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\Debug/recover.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/recover.pdb</ProgramDatabaseFile>
@@ -118,7 +117,6 @@ if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\Release/recover.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/recover.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>

diff --git a/win/win32/tile2bmp.vcxproj b/win/win32/tile2bmp.vcxproj
index 490ec1c889b7d67be77c3ed598b75651c015d08b..9c83ff979d23f7aef882c9c6656b3514925c87c5 100644 (file)
--- a/win/win32/tile2bmp.vcxproj
+++ b/win/win32/tile2bmp.vcxproj
@@ -38,10 +38,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   </PropertyGroup>
@@ -71,7 +71,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\tile2bmp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/tile2bmp.pdb</ProgramDatabaseFile>
@@ -112,7 +111,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\tile2bmp.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/tile2bmp.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>

diff --git a/win/win32/tilemap.vcxproj b/win/win32/tilemap.vcxproj
index 6822ea6db5210d1058bb44e7c5fae49ba0d7f6d0..6a05b3b8bad8f5e77257cc755d9c092b6b47994b 100644 (file)
--- a/win/win32/tilemap.vcxproj
+++ b/win/win32/tilemap.vcxproj
@@ -38,10 +38,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   </PropertyGroup>
@@ -71,7 +71,6 @@
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\tilemap.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/tilemap.pdb</ProgramDatabaseFile>
@@ -121,7 +120,6 @@ chdir ..\build
       <Culture>0x1009</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\tilemap.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/tilemap.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>

diff --git a/win/win32/tiles.vcxproj b/win/win32/tiles.vcxproj
index 3f338a5ed66e4576af577bbd53d620601d314dc2..dee603e0e5db1f6d05abeb67a02b8d468feb5acc 100644 (file)
--- a/win/win32/tiles.vcxproj
+++ b/win/win32/tiles.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>
@@ -48,7 +48,7 @@
     <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
     <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak"</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f "tiles.mak" /a</NMakeReBuildCommandLine>

diff --git a/win/win32/uudecode.vcxproj b/win/win32/uudecode.vcxproj
index c10e8c4a3957fd983659494361e4d756b92b91d0..d6dd4ae4674a041bc24af9c869da73facdd3b0dd 100644 (file)
--- a/win/win32/uudecode.vcxproj
+++ b/win/win32/uudecode.vcxproj
@@ -38,12 +38,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\util\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\util\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -70,7 +70,6 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\uudecode.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/uudecode.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -129,7 +128,6 @@ chdir ..\..\binary
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\util\uudecode.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/uudecode.pdb</ProgramDatabaseFile>