]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f222023)
windows build mods to support branch change
authornhmall <nhmall@nethack.org>
Wed, 17 Oct 2018 23:30:31 +0000 (19:30 -0400)
committerkeni <keni@his.com>
Sun, 21 Oct 2018 03:14:33 +0000 (23:14 -0400)
 Changes to be committed:
modified:   sys/winnt/Makefile.gcc
modified:   sys/winnt/Makefile.msc
modified:   win/win32/vs2015/NetHack.vcxproj
modified:   win/win32/vs2015/NetHackW.vcxproj
modified:   win/win32/vs2015/files.props
modified:   win/win32/vs2017/NetHack.vcxproj
modified:   win/win32/vs2017/NetHackW.vcxproj
modified:   win/win32/vs2017/files.props

sys/winnt/Makefile.gcc patch | blob | history
sys/winnt/Makefile.msc patch | blob | history
win/win32/vs2015/NetHack.vcxproj patch | blob | history
win/win32/vs2015/NetHackW.vcxproj patch | blob | history
win/win32/vs2015/files.props patch | blob | history
win/win32/vs2017/NetHack.vcxproj patch | blob | history
win/win32/vs2017/NetHackW.vcxproj patch | blob | history
win/win32/vs2017/files.props patch | blob | history

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 849724e555b3a414f75fec2ca328a81e816a47ce..f272bfcf7bfc7c3505884bf844cb8a9386bb08fe 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -352,7 +352,7 @@ VOBJ10 = $(O)mail.o     $(O)makemon.o  $(O)mapglyph.o $(O)mcastu.o
 VOBJ11 = $(O)mhitm.o    $(O)mhitu.o    $(O)minion.o   $(O)mklev.o
 VOBJ12 = $(O)mkmap.o    $(O)mkmaze.o   $(O)mkobj.o    $(O)mkroom.o
 VOBJ13 = $(O)mon.o      $(O)mondata.o  $(O)monmove.o  $(O)monst.o
-VOBJ14 = $(O)monstr.o   $(O)mplayer.o  $(O)mthrowu.o  $(O)muse.o
+VOBJ14 = $(O)mplayer.o  $(O)mthrowu.o  $(O)muse.o
 VOBJ15 = $(O)music.o    $(O)o_init.o   $(O)objects.o  $(O)objnam.o
 VOBJ16 = $(O)options.o  $(O)pager.o    $(O)pickup.o   $(O)pline.o
 VOBJ17 = $(O)polyself.o $(O)potion.o   $(O)pray.o     $(O)priest.o
@@ -637,7 +637,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des  $(DAT)/castle.des \
        $(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)levcomp.exe $(INCL)/vis_tab.h \
+        $(SRC)/vis_tab.c $(U)levcomp.exe $(INCL)/vis_tab.h \
         $(U)dgncomp.exe $(TILEUTIL16)
        $(subst /,\,@echo utilities made >$@)
        @echo utilities made.
@@ -743,12 +743,6 @@ $(INCL)/onames.h : $(U)makedefs.exe
 $(INCL)/pm.h : $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -p)
 
-#$(INCL)/trap.h : $(U)makedefs.exe
-#  $(U)makedefs -t
-
-$(SRC)/monstr.c: $(U)makedefs.exe
-       $(subst /,\,$(U)makedefs -m)
-
 $(INCL)/vis_tab.h: $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -z)
 
@@ -1129,7 +1123,6 @@ spotless: clean
        $(subst /,\,if exist $(DAT)/water.lev    del $(DAT)/water.lev)
        $(subst /,\,if exist $(DAT)/wizard?.lev  del $(DAT)/wizard?.lev)
        $(subst /,\,if exist $(O)sp_lev.tag     del $(O)sp_lev.tag)
-       $(subst /,\,if exist $(SRC)/monstr.c    del $(SRC)/monstr.c)
        $(subst /,\,if exist $(SRC)/vis_tab.c   del $(SRC)/vis_tab.c)
        $(subst /,\,if exist $(U)recover.exe    del $(U)recover.exe)
        $(subst /,\,if exist $(DAT)/dlb.lst      del $(DAT)/dlb.lst)
@@ -1400,7 +1393,6 @@ $(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h
        $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_clust.cpp
 $(O)qttableview.o: ../win/Qt/qttableview.cpp $(INCL)/qttableview.h
        $(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qttableview.cpp
-$(O)monstr.o: monstr.c $(CONFIG_H)
 $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
 $(O)allmain.o: allmain.c $(HACK_H)
 $(O)alloc.o: alloc.c $(CONFIG_H)
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 01c6dabaaef466472a15b951b04ba33db560dbf1..ca781610b60f3aebbe5cc744e6e3ee1d974f0f8d 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -384,7 +384,7 @@ VOBJ10 = $(O)mail.o     $(O)pcmain.o   $(O)makemon.o  $(O)mapglyph.o $(O)mcastu.
 VOBJ11 = $(O)mhitm.o    $(O)mhitu.o    $(O)minion.o   $(O)mklev.o   
 VOBJ12 = $(O)mkmap.o    $(O)mkmaze.o   $(O)mkobj.o    $(O)mkroom.o  
 VOBJ13 = $(O)mon.o      $(O)mondata.o  $(O)monmove.o  $(O)monst.o   
-VOBJ14 = $(O)monstr.o   $(O)mplayer.o  $(O)mthrowu.o  $(O)muse.o    
+VOBJ14 = $(O)mplayer.o  $(O)mthrowu.o  $(O)muse.o    
 VOBJ15 = $(O)music.o    $(O)o_init.o   $(O)objects.o  $(O)objnam.o  
 VOBJ16 = $(O)options.o  $(O)pager.o    $(O)pickup.o   $(O)pline.o   
 VOBJ17 = $(O)polyself.o $(O)potion.o   $(O)pray.o     $(O)priest.o  
@@ -638,7 +638,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des  $(DAT)\castle.des \
        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  \
+               $(SRC)\vis_tab.c  \
                $(U)levcomp.exe $(INCL)\vis_tab.h \
                $(U)dgncomp.exe $(TILEUTIL16)
              @echo utilities made >$@
@@ -839,12 +839,6 @@ $(INCL)\onames.h : $(U)makedefs.exe
 $(INCL)\pm.h : $(U)makedefs.exe
        $(U)makedefs -p
 
-#$(INCL)\trap.h : $(U)makedefs.exe
-#      $(U)makedefs -t
-
-$(SRC)\monstr.c: $(U)makedefs.exe
-       $(U)makedefs -m
-
 $(INCL)\vis_tab.h: $(U)makedefs.exe
        $(U)makedefs -z
 
@@ -1234,7 +1228,6 @@ spotless: clean
        if exist $(DAT)\dlb.lst          del $(DAT)\dlb.lst
        if exist $(DAT)\porthelp         del $(DAT)\porthelp
        if exist $(O)sp_lev.tag          del $(O)sp_lev.tag
-       if exist $(SRC)\monstr.c         del $(SRC)\monstr.c
        if exist $(SRC)\vis_tab.c        del $(SRC)\vis_tab.c
        if exist nhdat.                  del nhdat.
        if exist $(O)obj.tag             del $(O)obj.tag
@@ -1520,7 +1513,6 @@ $(O)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H)
        @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainout.c
 $(O)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) $(INCL)\func_tab.h
        @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_trace.c
-$(O)monstr.o: monstr.c $(CONFIG_H)
 $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h
 $(O)allmain.o: allmain.c $(HACK_H)
 $(O)alloc.o: alloc.c $(CONFIG_H)
diff --git a/win/win32/vs2015/NetHack.vcxproj b/win/win32/vs2015/NetHack.vcxproj
index 3c0ce99116b938be1a199fdda71f44c4c4ac44a3..8d9335f951021212fbc3e5b2ec559d44af052e6b 100755 (executable)
--- a/win/win32/vs2015/NetHack.vcxproj
+++ b/win/win32/vs2015/NetHack.vcxproj
@@ -1,233 +1,232 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />
+  <Import Project="config.props" />\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>NetHack</RootNamespace>\r
   </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <Import Project="default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="console.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
+  <Import Project="console.props" />\r
+  <Import Project="common.props" />\r
+  <Import Project="dirs.props" />\r
+  <Import Project="files.props" />\r
+  <PropertyGroup>\r
+    <OutDir>$(BinDir)</OutDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <OmitFramePointers>true</OmitFramePointers>\r
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(SrcDir)allmain.c" />
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SrcDir)apply.c" />
-    <ClCompile Include="$(SrcDir)artifact.c" />
-    <ClCompile Include="$(SrcDir)attrib.c" />
-    <ClCompile Include="$(SrcDir)ball.c" />
-    <ClCompile Include="$(SrcDir)bones.c" />
-    <ClCompile Include="$(SrcDir)botl.c" />
-    <ClCompile Include="$(SrcDir)cmd.c" />
-    <ClCompile Include="$(SrcDir)dbridge.c" />
-    <ClCompile Include="$(SrcDir)decl.c" />
-    <ClCompile Include="$(SrcDir)detect.c" />
-    <ClCompile Include="$(SrcDir)dig.c" />
-    <ClCompile Include="$(SrcDir)display.c" />
-    <ClCompile Include="$(SrcDir)dlb.c" />
-    <ClCompile Include="$(SrcDir)do.c" />
-    <ClCompile Include="$(SrcDir)dog.c" />
-    <ClCompile Include="$(SrcDir)dogmove.c" />
-    <ClCompile Include="$(SrcDir)dokick.c" />
-    <ClCompile Include="$(SrcDir)dothrow.c" />
-    <ClCompile Include="$(SrcDir)do_name.c" />
-    <ClCompile Include="$(SrcDir)do_wear.c" />
-    <ClCompile Include="$(SrcDir)drawing.c" />
-    <ClCompile Include="$(SrcDir)dungeon.c" />
-    <ClCompile Include="$(SrcDir)eat.c" />
-    <ClCompile Include="$(SrcDir)end.c" />
-    <ClCompile Include="$(SrcDir)engrave.c" />
-    <ClCompile Include="$(SrcDir)exper.c" />
-    <ClCompile Include="$(SrcDir)explode.c" />
-    <ClCompile Include="$(SrcDir)extralev.c" />
-    <ClCompile Include="$(SrcDir)files.c" />
-    <ClCompile Include="$(SrcDir)fountain.c" />
-    <ClCompile Include="$(SrcDir)hack.c" />
-    <ClCompile Include="$(SrcDir)hacklib.c" />
-    <ClCompile Include="$(SrcDir)invent.c" />
-    <ClCompile Include="$(SrcDir)light.c" />
-    <ClCompile Include="$(SrcDir)lock.c" />
-    <ClCompile Include="$(SrcDir)mail.c" />
-    <ClCompile Include="$(SrcDir)makemon.c" />
-    <ClCompile Include="$(SrcDir)mapglyph.c" />
-    <ClCompile Include="$(SrcDir)mcastu.c" />
-    <ClCompile Include="$(SrcDir)mhitm.c" />
-    <ClCompile Include="$(SrcDir)mhitu.c" />
-    <ClCompile Include="$(SrcDir)minion.c" />
-    <ClCompile Include="$(SrcDir)mklev.c" />
-    <ClCompile Include="$(SrcDir)mkmap.c" />
-    <ClCompile Include="$(SrcDir)mkmaze.c" />
-    <ClCompile Include="$(SrcDir)mkobj.c" />
-    <ClCompile Include="$(SrcDir)mkroom.c" />
-    <ClCompile Include="$(SrcDir)mon.c" />
-    <ClCompile Include="$(SrcDir)mondata.c" />
-    <ClCompile Include="$(SrcDir)monmove.c" />
-    <ClCompile Include="$(SrcDir)monst.c" />
-    <ClCompile Include="$(SrcDir)monstr.c" />
-    <ClCompile Include="$(SrcDir)mplayer.c" />
-    <ClCompile Include="$(SrcDir)mthrowu.c" />
-    <ClCompile Include="$(SrcDir)muse.c" />
-    <ClCompile Include="$(SrcDir)music.c" />
-    <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(SrcDir)objnam.c" />
-    <ClCompile Include="$(SrcDir)options.c" />
-    <ClCompile Include="$(SrcDir)o_init.c" />
-    <ClCompile Include="$(SrcDir)pager.c" />
-    <ClCompile Include="$(SrcDir)pickup.c" />
-    <ClCompile Include="$(SrcDir)pline.c" />
-    <ClCompile Include="$(SrcDir)polyself.c" />
-    <ClCompile Include="$(SrcDir)potion.c" />
-    <ClCompile Include="$(SrcDir)pray.c" />
-    <ClCompile Include="$(SrcDir)priest.c" />
-    <ClCompile Include="$(SrcDir)quest.c" />
-    <ClCompile Include="$(SrcDir)questpgr.c" />
-    <ClCompile Include="$(SrcDir)read.c" />
-    <ClCompile Include="$(SrcDir)rect.c" />
-    <ClCompile Include="$(SrcDir)region.c" />
-    <ClCompile Include="$(SrcDir)restore.c" />
-    <ClCompile Include="$(SrcDir)rip.c" />
-    <ClCompile Include="$(SrcDir)rnd.c" />
-    <ClCompile Include="$(SrcDir)role.c" />
-    <ClCompile Include="$(SrcDir)rumors.c" />
-    <ClCompile Include="$(SrcDir)save.c" />
-    <ClCompile Include="$(SrcDir)shk.c" />
-    <ClCompile Include="$(SrcDir)shknam.c" />
-    <ClCompile Include="$(SrcDir)sit.c" />
-    <ClCompile Include="$(SrcDir)sounds.c" />
-    <ClCompile Include="$(SrcDir)spell.c" />
-    <ClCompile Include="$(SrcDir)sp_lev.c" />
-    <ClCompile Include="$(SrcDir)steal.c" />
-    <ClCompile Include="$(SrcDir)steed.c" />
-    <ClCompile Include="$(SrcDir)sys.c" />
-    <ClCompile Include="$(SrcDir)teleport.c" />
-    <ClCompile Include="$(SrcDir)tile.c" />
-    <ClCompile Include="$(SrcDir)timeout.c" />
-    <ClCompile Include="$(SrcDir)topten.c" />
-    <ClCompile Include="$(SrcDir)track.c" />
-    <ClCompile Include="$(SrcDir)trap.c" />
-    <ClCompile Include="$(SrcDir)uhitm.c" />
-    <ClCompile Include="$(SrcDir)u_init.c" />
-    <ClCompile Include="$(SrcDir)vault.c" />
-    <ClCompile Include="$(SrcDir)version.c" />
-    <ClCompile Include="$(SrcDir)vision.c" />
-    <ClCompile Include="$(SrcDir)weapon.c" />
-    <ClCompile Include="$(SrcDir)were.c" />
-    <ClCompile Include="$(SrcDir)wield.c" />
-    <ClCompile Include="$(SrcDir)windows.c" />
-    <ClCompile Include="$(SrcDir)wizard.c" />
-    <ClCompile Include="$(SrcDir)worm.c" />
-    <ClCompile Include="$(SrcDir)worn.c" />
-    <ClCompile Include="$(SrcDir)write.c" />
-    <ClCompile Include="$(SrcDir)zap.c" />
-    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
-    <ClCompile Include="$(SysShareDir)nhlan.c" />
-    <ClCompile Include="$(SysShareDir)pcmain.c" />
-    <ClCompile Include="$(SysShareDir)pcsys.c" />
-    <ClCompile Include="$(SysShareDir)pcunix.c" />
-    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)nttty.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
-      <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    <ClCompile Include="$(SrcDir)allmain.c" />\r
+    <ClCompile Include="$(SrcDir)alloc.c" />\r
+    <ClCompile Include="$(SrcDir)apply.c" />\r
+    <ClCompile Include="$(SrcDir)artifact.c" />\r
+    <ClCompile Include="$(SrcDir)attrib.c" />\r
+    <ClCompile Include="$(SrcDir)ball.c" />\r
+    <ClCompile Include="$(SrcDir)bones.c" />\r
+    <ClCompile Include="$(SrcDir)botl.c" />\r
+    <ClCompile Include="$(SrcDir)cmd.c" />\r
+    <ClCompile Include="$(SrcDir)dbridge.c" />\r
+    <ClCompile Include="$(SrcDir)decl.c" />\r
+    <ClCompile Include="$(SrcDir)detect.c" />\r
+    <ClCompile Include="$(SrcDir)dig.c" />\r
+    <ClCompile Include="$(SrcDir)display.c" />\r
+    <ClCompile Include="$(SrcDir)dlb.c" />\r
+    <ClCompile Include="$(SrcDir)do.c" />\r
+    <ClCompile Include="$(SrcDir)dog.c" />\r
+    <ClCompile Include="$(SrcDir)dogmove.c" />\r
+    <ClCompile Include="$(SrcDir)dokick.c" />\r
+    <ClCompile Include="$(SrcDir)dothrow.c" />\r
+    <ClCompile Include="$(SrcDir)do_name.c" />\r
+    <ClCompile Include="$(SrcDir)do_wear.c" />\r
+    <ClCompile Include="$(SrcDir)drawing.c" />\r
+    <ClCompile Include="$(SrcDir)dungeon.c" />\r
+    <ClCompile Include="$(SrcDir)eat.c" />\r
+    <ClCompile Include="$(SrcDir)end.c" />\r
+    <ClCompile Include="$(SrcDir)engrave.c" />\r
+    <ClCompile Include="$(SrcDir)exper.c" />\r
+    <ClCompile Include="$(SrcDir)explode.c" />\r
+    <ClCompile Include="$(SrcDir)extralev.c" />\r
+    <ClCompile Include="$(SrcDir)files.c" />\r
+    <ClCompile Include="$(SrcDir)fountain.c" />\r
+    <ClCompile Include="$(SrcDir)hack.c" />\r
+    <ClCompile Include="$(SrcDir)hacklib.c" />\r
+    <ClCompile Include="$(SrcDir)invent.c" />\r
+    <ClCompile Include="$(SrcDir)light.c" />\r
+    <ClCompile Include="$(SrcDir)lock.c" />\r
+    <ClCompile Include="$(SrcDir)mail.c" />\r
+    <ClCompile Include="$(SrcDir)makemon.c" />\r
+    <ClCompile Include="$(SrcDir)mapglyph.c" />\r
+    <ClCompile Include="$(SrcDir)mcastu.c" />\r
+    <ClCompile Include="$(SrcDir)mhitm.c" />\r
+    <ClCompile Include="$(SrcDir)mhitu.c" />\r
+    <ClCompile Include="$(SrcDir)minion.c" />\r
+    <ClCompile Include="$(SrcDir)mklev.c" />\r
+    <ClCompile Include="$(SrcDir)mkmap.c" />\r
+    <ClCompile Include="$(SrcDir)mkmaze.c" />\r
+    <ClCompile Include="$(SrcDir)mkobj.c" />\r
+    <ClCompile Include="$(SrcDir)mkroom.c" />\r
+    <ClCompile Include="$(SrcDir)mon.c" />\r
+    <ClCompile Include="$(SrcDir)mondata.c" />\r
+    <ClCompile Include="$(SrcDir)monmove.c" />\r
+    <ClCompile Include="$(SrcDir)monst.c" />\r
+    <ClCompile Include="$(SrcDir)mplayer.c" />\r
+    <ClCompile Include="$(SrcDir)mthrowu.c" />\r
+    <ClCompile Include="$(SrcDir)muse.c" />\r
+    <ClCompile Include="$(SrcDir)music.c" />\r
+    <ClCompile Include="$(SrcDir)objects.c" />\r
+    <ClCompile Include="$(SrcDir)objnam.c" />\r
+    <ClCompile Include="$(SrcDir)options.c" />\r
+    <ClCompile Include="$(SrcDir)o_init.c" />\r
+    <ClCompile Include="$(SrcDir)pager.c" />\r
+    <ClCompile Include="$(SrcDir)pickup.c" />\r
+    <ClCompile Include="$(SrcDir)pline.c" />\r
+    <ClCompile Include="$(SrcDir)polyself.c" />\r
+    <ClCompile Include="$(SrcDir)potion.c" />\r
+    <ClCompile Include="$(SrcDir)pray.c" />\r
+    <ClCompile Include="$(SrcDir)priest.c" />\r
+    <ClCompile Include="$(SrcDir)quest.c" />\r
+    <ClCompile Include="$(SrcDir)questpgr.c" />\r
+    <ClCompile Include="$(SrcDir)read.c" />\r
+    <ClCompile Include="$(SrcDir)rect.c" />\r
+    <ClCompile Include="$(SrcDir)region.c" />\r
+    <ClCompile Include="$(SrcDir)restore.c" />\r
+    <ClCompile Include="$(SrcDir)rip.c" />\r
+    <ClCompile Include="$(SrcDir)rnd.c" />\r
+    <ClCompile Include="$(SrcDir)role.c" />\r
+    <ClCompile Include="$(SrcDir)rumors.c" />\r
+    <ClCompile Include="$(SrcDir)save.c" />\r
+    <ClCompile Include="$(SrcDir)shk.c" />\r
+    <ClCompile Include="$(SrcDir)shknam.c" />\r
+    <ClCompile Include="$(SrcDir)sit.c" />\r
+    <ClCompile Include="$(SrcDir)sounds.c" />\r
+    <ClCompile Include="$(SrcDir)spell.c" />\r
+    <ClCompile Include="$(SrcDir)sp_lev.c" />\r
+    <ClCompile Include="$(SrcDir)steal.c" />\r
+    <ClCompile Include="$(SrcDir)steed.c" />\r
+    <ClCompile Include="$(SrcDir)sys.c" />\r
+    <ClCompile Include="$(SrcDir)teleport.c" />\r
+    <ClCompile Include="$(SrcDir)tile.c" />\r
+    <ClCompile Include="$(SrcDir)timeout.c" />\r
+    <ClCompile Include="$(SrcDir)topten.c" />\r
+    <ClCompile Include="$(SrcDir)track.c" />\r
+    <ClCompile Include="$(SrcDir)trap.c" />\r
+    <ClCompile Include="$(SrcDir)uhitm.c" />\r
+    <ClCompile Include="$(SrcDir)u_init.c" />\r
+    <ClCompile Include="$(SrcDir)vault.c" />\r
+    <ClCompile Include="$(SrcDir)version.c" />\r
+    <ClCompile Include="$(SrcDir)vision.c" />\r
+    <ClCompile Include="$(SrcDir)weapon.c" />\r
+    <ClCompile Include="$(SrcDir)were.c" />\r
+    <ClCompile Include="$(SrcDir)wield.c" />\r
+    <ClCompile Include="$(SrcDir)windows.c" />\r
+    <ClCompile Include="$(SrcDir)wizard.c" />\r
+    <ClCompile Include="$(SrcDir)worm.c" />\r
+    <ClCompile Include="$(SrcDir)worn.c" />\r
+    <ClCompile Include="$(SrcDir)write.c" />\r
+    <ClCompile Include="$(SrcDir)zap.c" />\r
+    <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
+    <ClCompile Include="$(SysShareDir)nhlan.c" />\r
+    <ClCompile Include="$(SysShareDir)pcmain.c" />\r
+    <ClCompile Include="$(SysShareDir)pcsys.c" />\r
+    <ClCompile Include="$(SysShareDir)pcunix.c" />\r
+    <ClCompile Include="$(SysShareDir)random.c" />\r
+    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWinntDir)nttty.c" />\r
+    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+      <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
-    <ClCompile Include="$(WinTtyDir)getline.c" />
-    <ClCompile Include="$(WinTtyDir)topl.c" />
-    <ClCompile Include="$(WinTtyDir)wintty.c" />
+    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
+    <ClCompile Include="$(WinTtyDir)getline.c" />\r
+    <ClCompile Include="$(WinTtyDir)topl.c" />\r
+    <ClCompile Include="$(WinTtyDir)wintty.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="$(IncDir)align.h" />\r
+    <ClInclude Include="$(IncDir)artifact.h" />\r
+    <ClInclude Include="$(IncDir)artilist.h" />\r
+    <ClInclude Include="$(IncDir)attrib.h" />\r
+    <ClInclude Include="$(IncDir)botl.h" />\r
+    <ClInclude Include="$(IncDir)color.h" />\r
+    <ClInclude Include="$(IncDir)config.h" />\r
+    <ClInclude Include="$(IncDir)config1.h" />\r
+    <ClInclude Include="$(IncDir)context.h" />\r
+    <ClInclude Include="$(IncDir)coord.h" />\r
+    <ClInclude Include="$(IncDir)date.h" />\r
+    <ClInclude Include="$(IncDir)decl.h" />\r
+    <ClInclude Include="$(IncDir)display.h" />\r
+    <ClInclude Include="$(IncDir)dlb.h" />\r
+    <ClInclude Include="$(IncDir)dungeon.h" />\r
+    <ClInclude Include="$(IncDir)engrave.h" />\r
+    <ClInclude Include="$(IncDir)extern.h" />\r
+    <ClInclude Include="$(IncDir)flag.h" />\r
+    <ClInclude Include="$(IncDir)func_tab.h" />\r
+    <ClInclude Include="$(IncDir)global.h" />\r
+    <ClInclude Include="$(IncDir)hack.h" />\r
+    <ClInclude Include="$(IncDir)lev.h" />\r
+    <ClInclude Include="$(IncDir)mextra.h" />\r
+    <ClInclude Include="$(IncDir)mfndpos.h" />\r
+    <ClInclude Include="$(IncDir)mkroom.h" />\r
+    <ClInclude Include="$(IncDir)monattk.h" />\r
+    <ClInclude Include="$(IncDir)mondata.h" />\r
+    <ClInclude Include="$(IncDir)monflag.h" />\r
+    <ClInclude Include="$(IncDir)monst.h" />\r
+    <ClInclude Include="$(IncDir)monsym.h" />\r
+    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)obj.h" />\r
+    <ClInclude Include="$(IncDir)objclass.h" />\r
+    <ClInclude Include="$(IncDir)onames.h" />\r
+    <ClInclude Include="$(IncDir)patchlevel.h" />\r
+    <ClInclude Include="$(IncDir)permonst.h" />\r
+    <ClInclude Include="$(IncDir)pm.h" />\r
+    <ClInclude Include="$(IncDir)prop.h" />\r
+    <ClInclude Include="$(IncDir)qtext.h" />\r
+    <ClInclude Include="$(IncDir)quest.h" />\r
+    <ClInclude Include="$(IncDir)rect.h" />\r
+    <ClInclude Include="$(IncDir)region.h" />\r
+    <ClInclude Include="$(IncDir)rm.h" />\r
+    <ClInclude Include="$(IncDir)skills.h" />\r
+    <ClInclude Include="$(IncDir)spell.h" />\r
+    <ClInclude Include="$(IncDir)sp_lev.h" />\r
+    <ClInclude Include="$(IncDir)timeout.h" />\r
+    <ClInclude Include="$(IncDir)tradstdc.h" />\r
+    <ClInclude Include="$(IncDir)trap.h" />\r
+    <ClInclude Include="$(IncDir)vision.h" />\r
+    <ClInclude Include="$(IncDir)winprocs.h" />\r
+    <ClInclude Include="$(IncDir)wintty.h" />\r
+    <ClInclude Include="$(IncDir)wintype.h" />\r
+    <ClInclude Include="$(IncDir)you.h" />\r
+    <ClInclude Include="$(IncDir)youprop.h" />\r
+    <ClInclude Include="$(WinWin32Dir)nhresource.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="$(WinWin32Dir)NetHack.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="$(IncDir)align.h" />
-    <ClInclude Include="$(IncDir)artifact.h" />
-    <ClInclude Include="$(IncDir)artilist.h" />
-    <ClInclude Include="$(IncDir)attrib.h" />
-    <ClInclude Include="$(IncDir)botl.h" />
-    <ClInclude Include="$(IncDir)color.h" />
-    <ClInclude Include="$(IncDir)config.h" />
-    <ClInclude Include="$(IncDir)config1.h" />
-    <ClInclude Include="$(IncDir)context.h" />
-    <ClInclude Include="$(IncDir)coord.h" />
-    <ClInclude Include="$(IncDir)date.h" />
-    <ClInclude Include="$(IncDir)decl.h" />
-    <ClInclude Include="$(IncDir)display.h" />
-    <ClInclude Include="$(IncDir)dlb.h" />
-    <ClInclude Include="$(IncDir)dungeon.h" />
-    <ClInclude Include="$(IncDir)engrave.h" />
-    <ClInclude Include="$(IncDir)extern.h" />
-    <ClInclude Include="$(IncDir)flag.h" />
-    <ClInclude Include="$(IncDir)func_tab.h" />
-    <ClInclude Include="$(IncDir)global.h" />
-    <ClInclude Include="$(IncDir)hack.h" />
-    <ClInclude Include="$(IncDir)lev.h" />
-    <ClInclude Include="$(IncDir)mextra.h" />
-    <ClInclude Include="$(IncDir)mfndpos.h" />
-    <ClInclude Include="$(IncDir)mkroom.h" />
-    <ClInclude Include="$(IncDir)monattk.h" />
-    <ClInclude Include="$(IncDir)mondata.h" />
-    <ClInclude Include="$(IncDir)monflag.h" />
-    <ClInclude Include="$(IncDir)monst.h" />
-    <ClInclude Include="$(IncDir)monsym.h" />
-    <ClInclude Include="$(IncDir)ntconf.h" />
-    <ClInclude Include="$(IncDir)obj.h" />
-    <ClInclude Include="$(IncDir)objclass.h" />
-    <ClInclude Include="$(IncDir)onames.h" />
-    <ClInclude Include="$(IncDir)patchlevel.h" />
-    <ClInclude Include="$(IncDir)permonst.h" />
-    <ClInclude Include="$(IncDir)pm.h" />
-    <ClInclude Include="$(IncDir)prop.h" />
-    <ClInclude Include="$(IncDir)qtext.h" />
-    <ClInclude Include="$(IncDir)quest.h" />
-    <ClInclude Include="$(IncDir)rect.h" />
-    <ClInclude Include="$(IncDir)region.h" />
-    <ClInclude Include="$(IncDir)rm.h" />
-    <ClInclude Include="$(IncDir)skills.h" />
-    <ClInclude Include="$(IncDir)spell.h" />
-    <ClInclude Include="$(IncDir)sp_lev.h" />
-    <ClInclude Include="$(IncDir)timeout.h" />
-    <ClInclude Include="$(IncDir)tradstdc.h" />
-    <ClInclude Include="$(IncDir)trap.h" />
-    <ClInclude Include="$(IncDir)vision.h" />
-    <ClInclude Include="$(IncDir)winprocs.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(IncDir)wintype.h" />
-    <ClInclude Include="$(IncDir)you.h" />
-    <ClInclude Include="$(IncDir)youprop.h" />
-    <ClInclude Include="$(WinWin32Dir)nhresource.h" />
+    <Image Include="$(WinWin32Dir)nethack.ico" />\r
   </ItemGroup>\r
-  <ItemGroup>
-    <ResourceCompile Include="$(WinWin32Dir)NetHack.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="$(WinWin32Dir)nethack.ico" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <Target Name="AfterBuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-</Project>
\ No newline at end of file
+  <Target Name="AfterBuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterClean">\r
+    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterRebuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+</Project>\r
diff --git a/win/win32/vs2015/NetHackW.vcxproj b/win/win32/vs2015/NetHackW.vcxproj
index 52403bbf6a9abeb5f370da3087fdbb9af5524ff6..bd33da76f8d042f1a62785a004ee86f090f8d5b0 100755 (executable)
--- a/win/win32/vs2015/NetHackW.vcxproj
+++ b/win/win32/vs2015/NetHackW.vcxproj
@@ -1,192 +1,191 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="config.props" />
-
+  <Import Project="config.props" />\r
+\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>\r
     <RootNamespace>NetHackW</RootNamespace>\r
   </PropertyGroup>\r
-
+\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="default.props" />
+  <Import Project="default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
+  <Import Project="common.props" />\r
+  <Import Project="dirs.props" />\r
+  <Import Project="files.props" />\r
+\r
+  <PropertyGroup>\r
+    <OutDir>$(BinDir)</OutDir>\r
+  </PropertyGroup>\r
+\r
+  <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <OmitFramePointers>true</OmitFramePointers>\r
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-       <!-- TODO common.props has SubSystem Console -->
+       <!-- TODO common.props has SubSystem Console -->\r
       <SubSystem>Windows</SubSystem>\r
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
-
-
+\r
+\r
   <ItemGroup>\r
-    <ClCompile Include="$(SrcDir)allmain.c" />
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SrcDir)apply.c" />
-    <ClCompile Include="$(SrcDir)artifact.c" />
-    <ClCompile Include="$(SrcDir)attrib.c" />
-    <ClCompile Include="$(SrcDir)ball.c" />
-    <ClCompile Include="$(SrcDir)bones.c" />
-    <ClCompile Include="$(SrcDir)botl.c" />
-    <ClCompile Include="$(SrcDir)cmd.c" />
-    <ClCompile Include="$(SrcDir)dbridge.c" />
-    <ClCompile Include="$(SrcDir)decl.c" />
-    <ClCompile Include="$(SrcDir)detect.c" />
-    <ClCompile Include="$(SrcDir)dig.c" />
-    <ClCompile Include="$(SrcDir)display.c" />
-    <ClCompile Include="$(SrcDir)dlb.c" />
-    <ClCompile Include="$(SrcDir)do.c" />
-    <ClCompile Include="$(SrcDir)dog.c" />
-    <ClCompile Include="$(SrcDir)dogmove.c" />
-    <ClCompile Include="$(SrcDir)dokick.c" />
-    <ClCompile Include="$(SrcDir)dothrow.c" />
-    <ClCompile Include="$(SrcDir)do_name.c" />
-    <ClCompile Include="$(SrcDir)do_wear.c" />
-    <ClCompile Include="$(SrcDir)drawing.c" />
-    <ClCompile Include="$(SrcDir)dungeon.c" />
-    <ClCompile Include="$(SrcDir)eat.c" />
-    <ClCompile Include="$(SrcDir)end.c" />
-    <ClCompile Include="$(SrcDir)engrave.c" />
-    <ClCompile Include="$(SrcDir)exper.c" />
-    <ClCompile Include="$(SrcDir)explode.c" />
-    <ClCompile Include="$(SrcDir)extralev.c" />
-    <ClCompile Include="$(SrcDir)files.c" />
-    <ClCompile Include="$(SrcDir)fountain.c" />
-    <ClCompile Include="$(SrcDir)hack.c" />
-    <ClCompile Include="$(SrcDir)hacklib.c" />
-    <ClCompile Include="$(SrcDir)invent.c" />
-    <ClCompile Include="$(SrcDir)light.c" />
-    <ClCompile Include="$(SrcDir)lock.c" />
-    <ClCompile Include="$(SrcDir)mail.c" />
-    <ClCompile Include="$(SrcDir)makemon.c" />
-    <ClCompile Include="$(SrcDir)mapglyph.c" />
-    <ClCompile Include="$(SrcDir)mcastu.c" />
-    <ClCompile Include="$(SrcDir)mhitm.c" />
-    <ClCompile Include="$(SrcDir)mhitu.c" />
-    <ClCompile Include="$(SrcDir)minion.c" />
-    <ClCompile Include="$(SrcDir)mklev.c" />
-    <ClCompile Include="$(SrcDir)mkmap.c" />
-    <ClCompile Include="$(SrcDir)mkmaze.c" />
-    <ClCompile Include="$(SrcDir)mkobj.c" />
-    <ClCompile Include="$(SrcDir)mkroom.c" />
-    <ClCompile Include="$(SrcDir)mon.c" />
-    <ClCompile Include="$(SrcDir)mondata.c" />
-    <ClCompile Include="$(SrcDir)monmove.c" />
-    <ClCompile Include="$(SrcDir)monst.c" />
-    <ClCompile Include="$(SrcDir)monstr.c" />
-    <ClCompile Include="$(SrcDir)mplayer.c" />
-    <ClCompile Include="$(SrcDir)mthrowu.c" />
-    <ClCompile Include="$(SrcDir)muse.c" />
-    <ClCompile Include="$(SrcDir)music.c" />
-    <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(SrcDir)objnam.c" />
-    <ClCompile Include="$(SrcDir)options.c" />
-    <ClCompile Include="$(SrcDir)o_init.c" />
-    <ClCompile Include="$(SrcDir)pager.c" />
-    <ClCompile Include="$(SrcDir)pickup.c" />
-    <ClCompile Include="$(SrcDir)pline.c" />
-    <ClCompile Include="$(SrcDir)polyself.c" />
-    <ClCompile Include="$(SrcDir)potion.c" />
-    <ClCompile Include="$(SrcDir)pray.c" />
-    <ClCompile Include="$(SrcDir)priest.c" />
-    <ClCompile Include="$(SrcDir)quest.c" />
-    <ClCompile Include="$(SrcDir)questpgr.c" />
-    <ClCompile Include="$(SrcDir)read.c" />
-    <ClCompile Include="$(SrcDir)rect.c" />
-    <ClCompile Include="$(SrcDir)region.c" />
-    <ClCompile Include="$(SrcDir)restore.c" />
-    <ClCompile Include="$(SrcDir)rip.c" />
-    <ClCompile Include="$(SrcDir)rnd.c" />
-    <ClCompile Include="$(SrcDir)role.c" />
-    <ClCompile Include="$(SrcDir)rumors.c" />
-    <ClCompile Include="$(SrcDir)save.c" />
-    <ClCompile Include="$(SrcDir)shk.c" />
-    <ClCompile Include="$(SrcDir)shknam.c" />
-    <ClCompile Include="$(SrcDir)sit.c" />
-    <ClCompile Include="$(SrcDir)sounds.c" />
-    <ClCompile Include="$(SrcDir)spell.c" />
-    <ClCompile Include="$(SrcDir)sp_lev.c" />
-    <ClCompile Include="$(SrcDir)steal.c" />
-    <ClCompile Include="$(SrcDir)steed.c" />
-    <ClCompile Include="$(SrcDir)sys.c" />
-    <ClCompile Include="$(SrcDir)teleport.c" />
-    <ClCompile Include="$(SrcDir)tile.c" />
-    <ClCompile Include="$(SrcDir)timeout.c" />
-    <ClCompile Include="$(SrcDir)topten.c" />
-    <ClCompile Include="$(SrcDir)track.c" />
-    <ClCompile Include="$(SrcDir)trap.c" />
-    <ClCompile Include="$(SrcDir)uhitm.c" />
-    <ClCompile Include="$(SrcDir)u_init.c" />
-    <ClCompile Include="$(SrcDir)vault.c" />
-    <ClCompile Include="$(SrcDir)version.c" />
-    <ClCompile Include="$(SrcDir)vision.c" />
-    <ClCompile Include="$(SrcDir)vis_tab.c" />
-    <ClCompile Include="$(SrcDir)weapon.c" />
-    <ClCompile Include="$(SrcDir)were.c" />
-    <ClCompile Include="$(SrcDir)wield.c" />
-    <ClCompile Include="$(SrcDir)windows.c" />
-    <ClCompile Include="$(SrcDir)wizard.c" />
-    <ClCompile Include="$(SrcDir)worm.c" />
-    <ClCompile Include="$(SrcDir)worn.c" />
-    <ClCompile Include="$(SrcDir)write.c" />
-    <ClCompile Include="$(SrcDir)zap.c" />
-    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
-    <ClCompile Include="$(SysShareDir)nhlan.c" />
-    <ClCompile Include="$(SysShareDir)pcmain.c" />
-    <ClCompile Include="$(SysShareDir)pcsys.c" />
-    <ClCompile Include="$(SysShareDir)pcunix.c" />
-    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
-      <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>
+    <ClCompile Include="$(SrcDir)allmain.c" />\r
+    <ClCompile Include="$(SrcDir)alloc.c" />\r
+    <ClCompile Include="$(SrcDir)apply.c" />\r
+    <ClCompile Include="$(SrcDir)artifact.c" />\r
+    <ClCompile Include="$(SrcDir)attrib.c" />\r
+    <ClCompile Include="$(SrcDir)ball.c" />\r
+    <ClCompile Include="$(SrcDir)bones.c" />\r
+    <ClCompile Include="$(SrcDir)botl.c" />\r
+    <ClCompile Include="$(SrcDir)cmd.c" />\r
+    <ClCompile Include="$(SrcDir)dbridge.c" />\r
+    <ClCompile Include="$(SrcDir)decl.c" />\r
+    <ClCompile Include="$(SrcDir)detect.c" />\r
+    <ClCompile Include="$(SrcDir)dig.c" />\r
+    <ClCompile Include="$(SrcDir)display.c" />\r
+    <ClCompile Include="$(SrcDir)dlb.c" />\r
+    <ClCompile Include="$(SrcDir)do.c" />\r
+    <ClCompile Include="$(SrcDir)dog.c" />\r
+    <ClCompile Include="$(SrcDir)dogmove.c" />\r
+    <ClCompile Include="$(SrcDir)dokick.c" />\r
+    <ClCompile Include="$(SrcDir)dothrow.c" />\r
+    <ClCompile Include="$(SrcDir)do_name.c" />\r
+    <ClCompile Include="$(SrcDir)do_wear.c" />\r
+    <ClCompile Include="$(SrcDir)drawing.c" />\r
+    <ClCompile Include="$(SrcDir)dungeon.c" />\r
+    <ClCompile Include="$(SrcDir)eat.c" />\r
+    <ClCompile Include="$(SrcDir)end.c" />\r
+    <ClCompile Include="$(SrcDir)engrave.c" />\r
+    <ClCompile Include="$(SrcDir)exper.c" />\r
+    <ClCompile Include="$(SrcDir)explode.c" />\r
+    <ClCompile Include="$(SrcDir)extralev.c" />\r
+    <ClCompile Include="$(SrcDir)files.c" />\r
+    <ClCompile Include="$(SrcDir)fountain.c" />\r
+    <ClCompile Include="$(SrcDir)hack.c" />\r
+    <ClCompile Include="$(SrcDir)hacklib.c" />\r
+    <ClCompile Include="$(SrcDir)invent.c" />\r
+    <ClCompile Include="$(SrcDir)light.c" />\r
+    <ClCompile Include="$(SrcDir)lock.c" />\r
+    <ClCompile Include="$(SrcDir)mail.c" />\r
+    <ClCompile Include="$(SrcDir)makemon.c" />\r
+    <ClCompile Include="$(SrcDir)mapglyph.c" />\r
+    <ClCompile Include="$(SrcDir)mcastu.c" />\r
+    <ClCompile Include="$(SrcDir)mhitm.c" />\r
+    <ClCompile Include="$(SrcDir)mhitu.c" />\r
+    <ClCompile Include="$(SrcDir)minion.c" />\r
+    <ClCompile Include="$(SrcDir)mklev.c" />\r
+    <ClCompile Include="$(SrcDir)mkmap.c" />\r
+    <ClCompile Include="$(SrcDir)mkmaze.c" />\r
+    <ClCompile Include="$(SrcDir)mkobj.c" />\r
+    <ClCompile Include="$(SrcDir)mkroom.c" />\r
+    <ClCompile Include="$(SrcDir)mon.c" />\r
+    <ClCompile Include="$(SrcDir)mondata.c" />\r
+    <ClCompile Include="$(SrcDir)monmove.c" />\r
+    <ClCompile Include="$(SrcDir)monst.c" />\r
+    <ClCompile Include="$(SrcDir)mplayer.c" />\r
+    <ClCompile Include="$(SrcDir)mthrowu.c" />\r
+    <ClCompile Include="$(SrcDir)muse.c" />\r
+    <ClCompile Include="$(SrcDir)music.c" />\r
+    <ClCompile Include="$(SrcDir)objects.c" />\r
+    <ClCompile Include="$(SrcDir)objnam.c" />\r
+    <ClCompile Include="$(SrcDir)options.c" />\r
+    <ClCompile Include="$(SrcDir)o_init.c" />\r
+    <ClCompile Include="$(SrcDir)pager.c" />\r
+    <ClCompile Include="$(SrcDir)pickup.c" />\r
+    <ClCompile Include="$(SrcDir)pline.c" />\r
+    <ClCompile Include="$(SrcDir)polyself.c" />\r
+    <ClCompile Include="$(SrcDir)potion.c" />\r
+    <ClCompile Include="$(SrcDir)pray.c" />\r
+    <ClCompile Include="$(SrcDir)priest.c" />\r
+    <ClCompile Include="$(SrcDir)quest.c" />\r
+    <ClCompile Include="$(SrcDir)questpgr.c" />\r
+    <ClCompile Include="$(SrcDir)read.c" />\r
+    <ClCompile Include="$(SrcDir)rect.c" />\r
+    <ClCompile Include="$(SrcDir)region.c" />\r
+    <ClCompile Include="$(SrcDir)restore.c" />\r
+    <ClCompile Include="$(SrcDir)rip.c" />\r
+    <ClCompile Include="$(SrcDir)rnd.c" />\r
+    <ClCompile Include="$(SrcDir)role.c" />\r
+    <ClCompile Include="$(SrcDir)rumors.c" />\r
+    <ClCompile Include="$(SrcDir)save.c" />\r
+    <ClCompile Include="$(SrcDir)shk.c" />\r
+    <ClCompile Include="$(SrcDir)shknam.c" />\r
+    <ClCompile Include="$(SrcDir)sit.c" />\r
+    <ClCompile Include="$(SrcDir)sounds.c" />\r
+    <ClCompile Include="$(SrcDir)spell.c" />\r
+    <ClCompile Include="$(SrcDir)sp_lev.c" />\r
+    <ClCompile Include="$(SrcDir)steal.c" />\r
+    <ClCompile Include="$(SrcDir)steed.c" />\r
+    <ClCompile Include="$(SrcDir)sys.c" />\r
+    <ClCompile Include="$(SrcDir)teleport.c" />\r
+    <ClCompile Include="$(SrcDir)tile.c" />\r
+    <ClCompile Include="$(SrcDir)timeout.c" />\r
+    <ClCompile Include="$(SrcDir)topten.c" />\r
+    <ClCompile Include="$(SrcDir)track.c" />\r
+    <ClCompile Include="$(SrcDir)trap.c" />\r
+    <ClCompile Include="$(SrcDir)uhitm.c" />\r
+    <ClCompile Include="$(SrcDir)u_init.c" />\r
+    <ClCompile Include="$(SrcDir)vault.c" />\r
+    <ClCompile Include="$(SrcDir)version.c" />\r
+    <ClCompile Include="$(SrcDir)vision.c" />\r
+    <ClCompile Include="$(SrcDir)vis_tab.c" />\r
+    <ClCompile Include="$(SrcDir)weapon.c" />\r
+    <ClCompile Include="$(SrcDir)were.c" />\r
+    <ClCompile Include="$(SrcDir)wield.c" />\r
+    <ClCompile Include="$(SrcDir)windows.c" />\r
+    <ClCompile Include="$(SrcDir)wizard.c" />\r
+    <ClCompile Include="$(SrcDir)worm.c" />\r
+    <ClCompile Include="$(SrcDir)worn.c" />\r
+    <ClCompile Include="$(SrcDir)write.c" />\r
+    <ClCompile Include="$(SrcDir)zap.c" />\r
+    <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
+    <ClCompile Include="$(SysShareDir)nhlan.c" />\r
+    <ClCompile Include="$(SysShareDir)pcmain.c" />\r
+    <ClCompile Include="$(SysShareDir)pcsys.c" />\r
+    <ClCompile Include="$(SysShareDir)pcunix.c" />\r
+    <ClCompile Include="$(SysShareDir)random.c" />\r
+    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+      <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>\r
     </ClCompile>\r
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
-    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
-    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />
-    <ClCompile Include="$(WinWin32Dir)mhfont.c" />
-    <ClCompile Include="$(WinWin32Dir)mhinput.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmain.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmap.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmenu.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmsgwnd.c" />
-    <ClCompile Include="$(WinWin32Dir)mhrip.c" />
-    <ClCompile Include="$(WinWin32Dir)mhsplash.c" />
-    <ClCompile Include="$(WinWin32Dir)mhstatus.c" />
-    <ClCompile Include="$(WinWin32Dir)mhtext.c" />
-    <ClCompile Include="$(WinWin32Dir)mswproc.c" />
-    <ClCompile Include="$(WinWin32Dir)winhack.c" />
+    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhfont.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhinput.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmain.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmap.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmenu.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmsgwnd.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhrip.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhsplash.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhstatus.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhtext.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mswproc.c" />\r
+    <ClCompile Include="$(WinWin32Dir)winhack.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />
+    <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
- <Target Name="AfterBuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-
- </Project>
\ No newline at end of file
+ <Target Name="AfterBuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterClean">\r
+    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterRebuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+\r
+ </Project>\r
diff --git a/win/win32/vs2015/files.props b/win/win32/vs2015/files.props
index e40a34cb90d0c4577570a14217c566731b030d77..483ec1eb19781b77a92a626962f2793dcf45949f 100644 (file)
--- a/win/win32/vs2015/files.props
+++ b/win/win32/vs2015/files.props
@@ -8,8 +8,6 @@
     <Defs Include = "$(IncDir)onames.h"/>
        <!-- -p -->
     <Defs Include = "$(IncDir)pm.h"/>
-       <!-- -m -->
-    <Defs Include = "$(SrcDir)monstr.c"/>
        <!-- -z -->
     <Defs Include = "$(IncDir)vis_tab.h"/>
     <Defs Include = "$(SrcDir)vis_tab.c"/>
diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index dfa15c39199a3d330d1c504342cbd52fd41f19c4..66ad09e341dc92de50760fb9238817f6c898ae0b 100644 (file)
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -1,233 +1,232 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>NetHack</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="console.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SrcDir)allmain.c" />
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SrcDir)apply.c" />
-    <ClCompile Include="$(SrcDir)artifact.c" />
-    <ClCompile Include="$(SrcDir)attrib.c" />
-    <ClCompile Include="$(SrcDir)ball.c" />
-    <ClCompile Include="$(SrcDir)bones.c" />
-    <ClCompile Include="$(SrcDir)botl.c" />
-    <ClCompile Include="$(SrcDir)cmd.c" />
-    <ClCompile Include="$(SrcDir)dbridge.c" />
-    <ClCompile Include="$(SrcDir)decl.c" />
-    <ClCompile Include="$(SrcDir)detect.c" />
-    <ClCompile Include="$(SrcDir)dig.c" />
-    <ClCompile Include="$(SrcDir)display.c" />
-    <ClCompile Include="$(SrcDir)dlb.c" />
-    <ClCompile Include="$(SrcDir)do.c" />
-    <ClCompile Include="$(SrcDir)dog.c" />
-    <ClCompile Include="$(SrcDir)dogmove.c" />
-    <ClCompile Include="$(SrcDir)dokick.c" />
-    <ClCompile Include="$(SrcDir)dothrow.c" />
-    <ClCompile Include="$(SrcDir)do_name.c" />
-    <ClCompile Include="$(SrcDir)do_wear.c" />
-    <ClCompile Include="$(SrcDir)drawing.c" />
-    <ClCompile Include="$(SrcDir)dungeon.c" />
-    <ClCompile Include="$(SrcDir)eat.c" />
-    <ClCompile Include="$(SrcDir)end.c" />
-    <ClCompile Include="$(SrcDir)engrave.c" />
-    <ClCompile Include="$(SrcDir)exper.c" />
-    <ClCompile Include="$(SrcDir)explode.c" />
-    <ClCompile Include="$(SrcDir)extralev.c" />
-    <ClCompile Include="$(SrcDir)files.c" />
-    <ClCompile Include="$(SrcDir)fountain.c" />
-    <ClCompile Include="$(SrcDir)hack.c" />
-    <ClCompile Include="$(SrcDir)hacklib.c" />
-    <ClCompile Include="$(SrcDir)invent.c" />
-    <ClCompile Include="$(SrcDir)light.c" />
-    <ClCompile Include="$(SrcDir)lock.c" />
-    <ClCompile Include="$(SrcDir)mail.c" />
-    <ClCompile Include="$(SrcDir)makemon.c" />
-    <ClCompile Include="$(SrcDir)mapglyph.c" />
-    <ClCompile Include="$(SrcDir)mcastu.c" />
-    <ClCompile Include="$(SrcDir)mhitm.c" />
-    <ClCompile Include="$(SrcDir)mhitu.c" />
-    <ClCompile Include="$(SrcDir)minion.c" />
-    <ClCompile Include="$(SrcDir)mklev.c" />
-    <ClCompile Include="$(SrcDir)mkmap.c" />
-    <ClCompile Include="$(SrcDir)mkmaze.c" />
-    <ClCompile Include="$(SrcDir)mkobj.c" />
-    <ClCompile Include="$(SrcDir)mkroom.c" />
-    <ClCompile Include="$(SrcDir)mon.c" />
-    <ClCompile Include="$(SrcDir)mondata.c" />
-    <ClCompile Include="$(SrcDir)monmove.c" />
-    <ClCompile Include="$(SrcDir)monst.c" />
-    <ClCompile Include="$(SrcDir)monstr.c" />
-    <ClCompile Include="$(SrcDir)mplayer.c" />
-    <ClCompile Include="$(SrcDir)mthrowu.c" />
-    <ClCompile Include="$(SrcDir)muse.c" />
-    <ClCompile Include="$(SrcDir)music.c" />
-    <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(SrcDir)objnam.c" />
-    <ClCompile Include="$(SrcDir)options.c" />
-    <ClCompile Include="$(SrcDir)o_init.c" />
-    <ClCompile Include="$(SrcDir)pager.c" />
-    <ClCompile Include="$(SrcDir)pickup.c" />
-    <ClCompile Include="$(SrcDir)pline.c" />
-    <ClCompile Include="$(SrcDir)polyself.c" />
-    <ClCompile Include="$(SrcDir)potion.c" />
-    <ClCompile Include="$(SrcDir)pray.c" />
-    <ClCompile Include="$(SrcDir)priest.c" />
-    <ClCompile Include="$(SrcDir)quest.c" />
-    <ClCompile Include="$(SrcDir)questpgr.c" />
-    <ClCompile Include="$(SrcDir)read.c" />
-    <ClCompile Include="$(SrcDir)rect.c" />
-    <ClCompile Include="$(SrcDir)region.c" />
-    <ClCompile Include="$(SrcDir)restore.c" />
-    <ClCompile Include="$(SrcDir)rip.c" />
-    <ClCompile Include="$(SrcDir)rnd.c" />
-    <ClCompile Include="$(SrcDir)role.c" />
-    <ClCompile Include="$(SrcDir)rumors.c" />
-    <ClCompile Include="$(SrcDir)save.c" />
-    <ClCompile Include="$(SrcDir)shk.c" />
-    <ClCompile Include="$(SrcDir)shknam.c" />
-    <ClCompile Include="$(SrcDir)sit.c" />
-    <ClCompile Include="$(SrcDir)sounds.c" />
-    <ClCompile Include="$(SrcDir)spell.c" />
-    <ClCompile Include="$(SrcDir)sp_lev.c" />
-    <ClCompile Include="$(SrcDir)steal.c" />
-    <ClCompile Include="$(SrcDir)steed.c" />
-    <ClCompile Include="$(SrcDir)sys.c" />
-    <ClCompile Include="$(SrcDir)teleport.c" />
-    <ClCompile Include="$(SrcDir)tile.c" />
-    <ClCompile Include="$(SrcDir)timeout.c" />
-    <ClCompile Include="$(SrcDir)topten.c" />
-    <ClCompile Include="$(SrcDir)track.c" />
-    <ClCompile Include="$(SrcDir)trap.c" />
-    <ClCompile Include="$(SrcDir)uhitm.c" />
-    <ClCompile Include="$(SrcDir)u_init.c" />
-    <ClCompile Include="$(SrcDir)vault.c" />
-    <ClCompile Include="$(SrcDir)version.c" />
-    <ClCompile Include="$(SrcDir)vision.c" />
-    <ClCompile Include="$(SrcDir)weapon.c" />
-    <ClCompile Include="$(SrcDir)were.c" />
-    <ClCompile Include="$(SrcDir)wield.c" />
-    <ClCompile Include="$(SrcDir)windows.c" />
-    <ClCompile Include="$(SrcDir)wizard.c" />
-    <ClCompile Include="$(SrcDir)worm.c" />
-    <ClCompile Include="$(SrcDir)worn.c" />
-    <ClCompile Include="$(SrcDir)write.c" />
-    <ClCompile Include="$(SrcDir)zap.c" />
-    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
-    <ClCompile Include="$(SysShareDir)nhlan.c" />
-    <ClCompile Include="$(SysShareDir)pcmain.c" />
-    <ClCompile Include="$(SysShareDir)pcsys.c" />
-    <ClCompile Include="$(SysShareDir)pcunix.c" />
-    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)nttty.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
-      <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
-    <ClCompile Include="$(WinTtyDir)getline.c" />
-    <ClCompile Include="$(WinTtyDir)topl.c" />
-    <ClCompile Include="$(WinTtyDir)wintty.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)align.h" />
-    <ClInclude Include="$(IncDir)artifact.h" />
-    <ClInclude Include="$(IncDir)artilist.h" />
-    <ClInclude Include="$(IncDir)attrib.h" />
-    <ClInclude Include="$(IncDir)botl.h" />
-    <ClInclude Include="$(IncDir)color.h" />
-    <ClInclude Include="$(IncDir)config.h" />
-    <ClInclude Include="$(IncDir)config1.h" />
-    <ClInclude Include="$(IncDir)context.h" />
-    <ClInclude Include="$(IncDir)coord.h" />
-    <ClInclude Include="$(IncDir)date.h" />
-    <ClInclude Include="$(IncDir)decl.h" />
-    <ClInclude Include="$(IncDir)display.h" />
-    <ClInclude Include="$(IncDir)dlb.h" />
-    <ClInclude Include="$(IncDir)dungeon.h" />
-    <ClInclude Include="$(IncDir)engrave.h" />
-    <ClInclude Include="$(IncDir)extern.h" />
-    <ClInclude Include="$(IncDir)flag.h" />
-    <ClInclude Include="$(IncDir)func_tab.h" />
-    <ClInclude Include="$(IncDir)global.h" />
-    <ClInclude Include="$(IncDir)hack.h" />
-    <ClInclude Include="$(IncDir)lev.h" />
-    <ClInclude Include="$(IncDir)mextra.h" />
-    <ClInclude Include="$(IncDir)mfndpos.h" />
-    <ClInclude Include="$(IncDir)mkroom.h" />
-    <ClInclude Include="$(IncDir)monattk.h" />
-    <ClInclude Include="$(IncDir)mondata.h" />
-    <ClInclude Include="$(IncDir)monflag.h" />
-    <ClInclude Include="$(IncDir)monst.h" />
-    <ClInclude Include="$(IncDir)monsym.h" />
-    <ClInclude Include="$(IncDir)ntconf.h" />
-    <ClInclude Include="$(IncDir)obj.h" />
-    <ClInclude Include="$(IncDir)objclass.h" />
-    <ClInclude Include="$(IncDir)onames.h" />
-    <ClInclude Include="$(IncDir)patchlevel.h" />
-    <ClInclude Include="$(IncDir)permonst.h" />
-    <ClInclude Include="$(IncDir)pm.h" />
-    <ClInclude Include="$(IncDir)prop.h" />
-    <ClInclude Include="$(IncDir)qtext.h" />
-    <ClInclude Include="$(IncDir)quest.h" />
-    <ClInclude Include="$(IncDir)rect.h" />
-    <ClInclude Include="$(IncDir)region.h" />
-    <ClInclude Include="$(IncDir)rm.h" />
-    <ClInclude Include="$(IncDir)skills.h" />
-    <ClInclude Include="$(IncDir)spell.h" />
-    <ClInclude Include="$(IncDir)sp_lev.h" />
-    <ClInclude Include="$(IncDir)timeout.h" />
-    <ClInclude Include="$(IncDir)tradstdc.h" />
-    <ClInclude Include="$(IncDir)trap.h" />
-    <ClInclude Include="$(IncDir)vision.h" />
-    <ClInclude Include="$(IncDir)winprocs.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(IncDir)wintype.h" />
-    <ClInclude Include="$(IncDir)you.h" />
-    <ClInclude Include="$(IncDir)youprop.h" />
-    <ClInclude Include="$(WinWin32Dir)nhresource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="$(WinWin32Dir)NetHack.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="$(WinWin32Dir)nethack.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="AfterBuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <Import Project="config.props" />\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>NetHack</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <Import Project="default.props" />\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="console.props" />\r
+  <Import Project="common.props" />\r
+  <Import Project="dirs.props" />\r
+  <Import Project="files.props" />\r
+  <PropertyGroup>\r
+    <OutDir>$(BinDir)</OutDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
+      <OmitFramePointers>true</OmitFramePointers>\r
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="$(SrcDir)allmain.c" />\r
+    <ClCompile Include="$(SrcDir)alloc.c" />\r
+    <ClCompile Include="$(SrcDir)apply.c" />\r
+    <ClCompile Include="$(SrcDir)artifact.c" />\r
+    <ClCompile Include="$(SrcDir)attrib.c" />\r
+    <ClCompile Include="$(SrcDir)ball.c" />\r
+    <ClCompile Include="$(SrcDir)bones.c" />\r
+    <ClCompile Include="$(SrcDir)botl.c" />\r
+    <ClCompile Include="$(SrcDir)cmd.c" />\r
+    <ClCompile Include="$(SrcDir)dbridge.c" />\r
+    <ClCompile Include="$(SrcDir)decl.c" />\r
+    <ClCompile Include="$(SrcDir)detect.c" />\r
+    <ClCompile Include="$(SrcDir)dig.c" />\r
+    <ClCompile Include="$(SrcDir)display.c" />\r
+    <ClCompile Include="$(SrcDir)dlb.c" />\r
+    <ClCompile Include="$(SrcDir)do.c" />\r
+    <ClCompile Include="$(SrcDir)dog.c" />\r
+    <ClCompile Include="$(SrcDir)dogmove.c" />\r
+    <ClCompile Include="$(SrcDir)dokick.c" />\r
+    <ClCompile Include="$(SrcDir)dothrow.c" />\r
+    <ClCompile Include="$(SrcDir)do_name.c" />\r
+    <ClCompile Include="$(SrcDir)do_wear.c" />\r
+    <ClCompile Include="$(SrcDir)drawing.c" />\r
+    <ClCompile Include="$(SrcDir)dungeon.c" />\r
+    <ClCompile Include="$(SrcDir)eat.c" />\r
+    <ClCompile Include="$(SrcDir)end.c" />\r
+    <ClCompile Include="$(SrcDir)engrave.c" />\r
+    <ClCompile Include="$(SrcDir)exper.c" />\r
+    <ClCompile Include="$(SrcDir)explode.c" />\r
+    <ClCompile Include="$(SrcDir)extralev.c" />\r
+    <ClCompile Include="$(SrcDir)files.c" />\r
+    <ClCompile Include="$(SrcDir)fountain.c" />\r
+    <ClCompile Include="$(SrcDir)hack.c" />\r
+    <ClCompile Include="$(SrcDir)hacklib.c" />\r
+    <ClCompile Include="$(SrcDir)invent.c" />\r
+    <ClCompile Include="$(SrcDir)light.c" />\r
+    <ClCompile Include="$(SrcDir)lock.c" />\r
+    <ClCompile Include="$(SrcDir)mail.c" />\r
+    <ClCompile Include="$(SrcDir)makemon.c" />\r
+    <ClCompile Include="$(SrcDir)mapglyph.c" />\r
+    <ClCompile Include="$(SrcDir)mcastu.c" />\r
+    <ClCompile Include="$(SrcDir)mhitm.c" />\r
+    <ClCompile Include="$(SrcDir)mhitu.c" />\r
+    <ClCompile Include="$(SrcDir)minion.c" />\r
+    <ClCompile Include="$(SrcDir)mklev.c" />\r
+    <ClCompile Include="$(SrcDir)mkmap.c" />\r
+    <ClCompile Include="$(SrcDir)mkmaze.c" />\r
+    <ClCompile Include="$(SrcDir)mkobj.c" />\r
+    <ClCompile Include="$(SrcDir)mkroom.c" />\r
+    <ClCompile Include="$(SrcDir)mon.c" />\r
+    <ClCompile Include="$(SrcDir)mondata.c" />\r
+    <ClCompile Include="$(SrcDir)monmove.c" />\r
+    <ClCompile Include="$(SrcDir)monst.c" />\r
+    <ClCompile Include="$(SrcDir)mplayer.c" />\r
+    <ClCompile Include="$(SrcDir)mthrowu.c" />\r
+    <ClCompile Include="$(SrcDir)muse.c" />\r
+    <ClCompile Include="$(SrcDir)music.c" />\r
+    <ClCompile Include="$(SrcDir)objects.c" />\r
+    <ClCompile Include="$(SrcDir)objnam.c" />\r
+    <ClCompile Include="$(SrcDir)options.c" />\r
+    <ClCompile Include="$(SrcDir)o_init.c" />\r
+    <ClCompile Include="$(SrcDir)pager.c" />\r
+    <ClCompile Include="$(SrcDir)pickup.c" />\r
+    <ClCompile Include="$(SrcDir)pline.c" />\r
+    <ClCompile Include="$(SrcDir)polyself.c" />\r
+    <ClCompile Include="$(SrcDir)potion.c" />\r
+    <ClCompile Include="$(SrcDir)pray.c" />\r
+    <ClCompile Include="$(SrcDir)priest.c" />\r
+    <ClCompile Include="$(SrcDir)quest.c" />\r
+    <ClCompile Include="$(SrcDir)questpgr.c" />\r
+    <ClCompile Include="$(SrcDir)read.c" />\r
+    <ClCompile Include="$(SrcDir)rect.c" />\r
+    <ClCompile Include="$(SrcDir)region.c" />\r
+    <ClCompile Include="$(SrcDir)restore.c" />\r
+    <ClCompile Include="$(SrcDir)rip.c" />\r
+    <ClCompile Include="$(SrcDir)rnd.c" />\r
+    <ClCompile Include="$(SrcDir)role.c" />\r
+    <ClCompile Include="$(SrcDir)rumors.c" />\r
+    <ClCompile Include="$(SrcDir)save.c" />\r
+    <ClCompile Include="$(SrcDir)shk.c" />\r
+    <ClCompile Include="$(SrcDir)shknam.c" />\r
+    <ClCompile Include="$(SrcDir)sit.c" />\r
+    <ClCompile Include="$(SrcDir)sounds.c" />\r
+    <ClCompile Include="$(SrcDir)spell.c" />\r
+    <ClCompile Include="$(SrcDir)sp_lev.c" />\r
+    <ClCompile Include="$(SrcDir)steal.c" />\r
+    <ClCompile Include="$(SrcDir)steed.c" />\r
+    <ClCompile Include="$(SrcDir)sys.c" />\r
+    <ClCompile Include="$(SrcDir)teleport.c" />\r
+    <ClCompile Include="$(SrcDir)tile.c" />\r
+    <ClCompile Include="$(SrcDir)timeout.c" />\r
+    <ClCompile Include="$(SrcDir)topten.c" />\r
+    <ClCompile Include="$(SrcDir)track.c" />\r
+    <ClCompile Include="$(SrcDir)trap.c" />\r
+    <ClCompile Include="$(SrcDir)uhitm.c" />\r
+    <ClCompile Include="$(SrcDir)u_init.c" />\r
+    <ClCompile Include="$(SrcDir)vault.c" />\r
+    <ClCompile Include="$(SrcDir)version.c" />\r
+    <ClCompile Include="$(SrcDir)vision.c" />\r
+    <ClCompile Include="$(SrcDir)weapon.c" />\r
+    <ClCompile Include="$(SrcDir)were.c" />\r
+    <ClCompile Include="$(SrcDir)wield.c" />\r
+    <ClCompile Include="$(SrcDir)windows.c" />\r
+    <ClCompile Include="$(SrcDir)wizard.c" />\r
+    <ClCompile Include="$(SrcDir)worm.c" />\r
+    <ClCompile Include="$(SrcDir)worn.c" />\r
+    <ClCompile Include="$(SrcDir)write.c" />\r
+    <ClCompile Include="$(SrcDir)zap.c" />\r
+    <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
+    <ClCompile Include="$(SysShareDir)nhlan.c" />\r
+    <ClCompile Include="$(SysShareDir)pcmain.c" />\r
+    <ClCompile Include="$(SysShareDir)pcsys.c" />\r
+    <ClCompile Include="$(SysShareDir)pcunix.c" />\r
+    <ClCompile Include="$(SysShareDir)random.c" />\r
+    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWinntDir)nttty.c" />\r
+    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+      <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
+    <ClCompile Include="$(WinTtyDir)getline.c" />\r
+    <ClCompile Include="$(WinTtyDir)topl.c" />\r
+    <ClCompile Include="$(WinTtyDir)wintty.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="$(IncDir)align.h" />\r
+    <ClInclude Include="$(IncDir)artifact.h" />\r
+    <ClInclude Include="$(IncDir)artilist.h" />\r
+    <ClInclude Include="$(IncDir)attrib.h" />\r
+    <ClInclude Include="$(IncDir)botl.h" />\r
+    <ClInclude Include="$(IncDir)color.h" />\r
+    <ClInclude Include="$(IncDir)config.h" />\r
+    <ClInclude Include="$(IncDir)config1.h" />\r
+    <ClInclude Include="$(IncDir)context.h" />\r
+    <ClInclude Include="$(IncDir)coord.h" />\r
+    <ClInclude Include="$(IncDir)date.h" />\r
+    <ClInclude Include="$(IncDir)decl.h" />\r
+    <ClInclude Include="$(IncDir)display.h" />\r
+    <ClInclude Include="$(IncDir)dlb.h" />\r
+    <ClInclude Include="$(IncDir)dungeon.h" />\r
+    <ClInclude Include="$(IncDir)engrave.h" />\r
+    <ClInclude Include="$(IncDir)extern.h" />\r
+    <ClInclude Include="$(IncDir)flag.h" />\r
+    <ClInclude Include="$(IncDir)func_tab.h" />\r
+    <ClInclude Include="$(IncDir)global.h" />\r
+    <ClInclude Include="$(IncDir)hack.h" />\r
+    <ClInclude Include="$(IncDir)lev.h" />\r
+    <ClInclude Include="$(IncDir)mextra.h" />\r
+    <ClInclude Include="$(IncDir)mfndpos.h" />\r
+    <ClInclude Include="$(IncDir)mkroom.h" />\r
+    <ClInclude Include="$(IncDir)monattk.h" />\r
+    <ClInclude Include="$(IncDir)mondata.h" />\r
+    <ClInclude Include="$(IncDir)monflag.h" />\r
+    <ClInclude Include="$(IncDir)monst.h" />\r
+    <ClInclude Include="$(IncDir)monsym.h" />\r
+    <ClInclude Include="$(IncDir)ntconf.h" />\r
+    <ClInclude Include="$(IncDir)obj.h" />\r
+    <ClInclude Include="$(IncDir)objclass.h" />\r
+    <ClInclude Include="$(IncDir)onames.h" />\r
+    <ClInclude Include="$(IncDir)patchlevel.h" />\r
+    <ClInclude Include="$(IncDir)permonst.h" />\r
+    <ClInclude Include="$(IncDir)pm.h" />\r
+    <ClInclude Include="$(IncDir)prop.h" />\r
+    <ClInclude Include="$(IncDir)qtext.h" />\r
+    <ClInclude Include="$(IncDir)quest.h" />\r
+    <ClInclude Include="$(IncDir)rect.h" />\r
+    <ClInclude Include="$(IncDir)region.h" />\r
+    <ClInclude Include="$(IncDir)rm.h" />\r
+    <ClInclude Include="$(IncDir)skills.h" />\r
+    <ClInclude Include="$(IncDir)spell.h" />\r
+    <ClInclude Include="$(IncDir)sp_lev.h" />\r
+    <ClInclude Include="$(IncDir)timeout.h" />\r
+    <ClInclude Include="$(IncDir)tradstdc.h" />\r
+    <ClInclude Include="$(IncDir)trap.h" />\r
+    <ClInclude Include="$(IncDir)vision.h" />\r
+    <ClInclude Include="$(IncDir)winprocs.h" />\r
+    <ClInclude Include="$(IncDir)wintty.h" />\r
+    <ClInclude Include="$(IncDir)wintype.h" />\r
+    <ClInclude Include="$(IncDir)you.h" />\r
+    <ClInclude Include="$(IncDir)youprop.h" />\r
+    <ClInclude Include="$(WinWin32Dir)nhresource.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="$(WinWin32Dir)NetHack.rc" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Image Include="$(WinWin32Dir)nethack.ico" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <Target Name="AfterBuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterClean">\r
+    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterRebuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+</Project>\r
diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj
index d1cd0bb919bdabedafb4fadc5ab8723587b7382f..450210b8144af3b3d5e226abc530079c5552df9e 100644 (file)
--- a/win/win32/vs2017/NetHackW.vcxproj
+++ b/win/win32/vs2017/NetHackW.vcxproj
@@ -1,184 +1,183 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>
-    <RootNamespace>NetHackW</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SrcDir)allmain.c" />
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SrcDir)apply.c" />
-    <ClCompile Include="$(SrcDir)artifact.c" />
-    <ClCompile Include="$(SrcDir)attrib.c" />
-    <ClCompile Include="$(SrcDir)ball.c" />
-    <ClCompile Include="$(SrcDir)bones.c" />
-    <ClCompile Include="$(SrcDir)botl.c" />
-    <ClCompile Include="$(SrcDir)cmd.c" />
-    <ClCompile Include="$(SrcDir)dbridge.c" />
-    <ClCompile Include="$(SrcDir)decl.c" />
-    <ClCompile Include="$(SrcDir)detect.c" />
-    <ClCompile Include="$(SrcDir)dig.c" />
-    <ClCompile Include="$(SrcDir)display.c" />
-    <ClCompile Include="$(SrcDir)dlb.c" />
-    <ClCompile Include="$(SrcDir)do.c" />
-    <ClCompile Include="$(SrcDir)dog.c" />
-    <ClCompile Include="$(SrcDir)dogmove.c" />
-    <ClCompile Include="$(SrcDir)dokick.c" />
-    <ClCompile Include="$(SrcDir)dothrow.c" />
-    <ClCompile Include="$(SrcDir)do_name.c" />
-    <ClCompile Include="$(SrcDir)do_wear.c" />
-    <ClCompile Include="$(SrcDir)drawing.c" />
-    <ClCompile Include="$(SrcDir)dungeon.c" />
-    <ClCompile Include="$(SrcDir)eat.c" />
-    <ClCompile Include="$(SrcDir)end.c" />
-    <ClCompile Include="$(SrcDir)engrave.c" />
-    <ClCompile Include="$(SrcDir)exper.c" />
-    <ClCompile Include="$(SrcDir)explode.c" />
-    <ClCompile Include="$(SrcDir)extralev.c" />
-    <ClCompile Include="$(SrcDir)files.c" />
-    <ClCompile Include="$(SrcDir)fountain.c" />
-    <ClCompile Include="$(SrcDir)hack.c" />
-    <ClCompile Include="$(SrcDir)hacklib.c" />
-    <ClCompile Include="$(SrcDir)invent.c" />
-    <ClCompile Include="$(SrcDir)light.c" />
-    <ClCompile Include="$(SrcDir)lock.c" />
-    <ClCompile Include="$(SrcDir)mail.c" />
-    <ClCompile Include="$(SrcDir)makemon.c" />
-    <ClCompile Include="$(SrcDir)mapglyph.c" />
-    <ClCompile Include="$(SrcDir)mcastu.c" />
-    <ClCompile Include="$(SrcDir)mhitm.c" />
-    <ClCompile Include="$(SrcDir)mhitu.c" />
-    <ClCompile Include="$(SrcDir)minion.c" />
-    <ClCompile Include="$(SrcDir)mklev.c" />
-    <ClCompile Include="$(SrcDir)mkmap.c" />
-    <ClCompile Include="$(SrcDir)mkmaze.c" />
-    <ClCompile Include="$(SrcDir)mkobj.c" />
-    <ClCompile Include="$(SrcDir)mkroom.c" />
-    <ClCompile Include="$(SrcDir)mon.c" />
-    <ClCompile Include="$(SrcDir)mondata.c" />
-    <ClCompile Include="$(SrcDir)monmove.c" />
-    <ClCompile Include="$(SrcDir)monst.c" />
-    <ClCompile Include="$(SrcDir)monstr.c" />
-    <ClCompile Include="$(SrcDir)mplayer.c" />
-    <ClCompile Include="$(SrcDir)mthrowu.c" />
-    <ClCompile Include="$(SrcDir)muse.c" />
-    <ClCompile Include="$(SrcDir)music.c" />
-    <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(SrcDir)objnam.c" />
-    <ClCompile Include="$(SrcDir)options.c" />
-    <ClCompile Include="$(SrcDir)o_init.c" />
-    <ClCompile Include="$(SrcDir)pager.c" />
-    <ClCompile Include="$(SrcDir)pickup.c" />
-    <ClCompile Include="$(SrcDir)pline.c" />
-    <ClCompile Include="$(SrcDir)polyself.c" />
-    <ClCompile Include="$(SrcDir)potion.c" />
-    <ClCompile Include="$(SrcDir)pray.c" />
-    <ClCompile Include="$(SrcDir)priest.c" />
-    <ClCompile Include="$(SrcDir)quest.c" />
-    <ClCompile Include="$(SrcDir)questpgr.c" />
-    <ClCompile Include="$(SrcDir)read.c" />
-    <ClCompile Include="$(SrcDir)rect.c" />
-    <ClCompile Include="$(SrcDir)region.c" />
-    <ClCompile Include="$(SrcDir)restore.c" />
-    <ClCompile Include="$(SrcDir)rip.c" />
-    <ClCompile Include="$(SrcDir)rnd.c" />
-    <ClCompile Include="$(SrcDir)role.c" />
-    <ClCompile Include="$(SrcDir)rumors.c" />
-    <ClCompile Include="$(SrcDir)save.c" />
-    <ClCompile Include="$(SrcDir)shk.c" />
-    <ClCompile Include="$(SrcDir)shknam.c" />
-    <ClCompile Include="$(SrcDir)sit.c" />
-    <ClCompile Include="$(SrcDir)sounds.c" />
-    <ClCompile Include="$(SrcDir)spell.c" />
-    <ClCompile Include="$(SrcDir)sp_lev.c" />
-    <ClCompile Include="$(SrcDir)steal.c" />
-    <ClCompile Include="$(SrcDir)steed.c" />
-    <ClCompile Include="$(SrcDir)sys.c" />
-    <ClCompile Include="$(SrcDir)teleport.c" />
-    <ClCompile Include="$(SrcDir)tile.c" />
-    <ClCompile Include="$(SrcDir)timeout.c" />
-    <ClCompile Include="$(SrcDir)topten.c" />
-    <ClCompile Include="$(SrcDir)track.c" />
-    <ClCompile Include="$(SrcDir)trap.c" />
-    <ClCompile Include="$(SrcDir)uhitm.c" />
-    <ClCompile Include="$(SrcDir)u_init.c" />
-    <ClCompile Include="$(SrcDir)vault.c" />
-    <ClCompile Include="$(SrcDir)version.c" />
-    <ClCompile Include="$(SrcDir)vision.c" />
-    <ClCompile Include="$(SrcDir)vis_tab.c" />
-    <ClCompile Include="$(SrcDir)weapon.c" />
-    <ClCompile Include="$(SrcDir)were.c" />
-    <ClCompile Include="$(SrcDir)wield.c" />
-    <ClCompile Include="$(SrcDir)windows.c" />
-    <ClCompile Include="$(SrcDir)wizard.c" />
-    <ClCompile Include="$(SrcDir)worm.c" />
-    <ClCompile Include="$(SrcDir)worn.c" />
-    <ClCompile Include="$(SrcDir)write.c" />
-    <ClCompile Include="$(SrcDir)zap.c" />
-    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
-    <ClCompile Include="$(SysShareDir)nhlan.c" />
-    <ClCompile Include="$(SysShareDir)pcmain.c" />
-    <ClCompile Include="$(SysShareDir)pcsys.c" />
-    <ClCompile Include="$(SysShareDir)pcunix.c" />
-    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
-      <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
-    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
-    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />
-    <ClCompile Include="$(WinWin32Dir)mhfont.c" />
-    <ClCompile Include="$(WinWin32Dir)mhinput.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmain.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmap.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmenu.c" />
-    <ClCompile Include="$(WinWin32Dir)mhmsgwnd.c" />
-    <ClCompile Include="$(WinWin32Dir)mhrip.c" />
-    <ClCompile Include="$(WinWin32Dir)mhsplash.c" />
-    <ClCompile Include="$(WinWin32Dir)mhstatus.c" />
-    <ClCompile Include="$(WinWin32Dir)mhtext.c" />
-    <ClCompile Include="$(WinWin32Dir)mswproc.c" />
-    <ClCompile Include="$(WinWin32Dir)winhack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="AfterBuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <Import Project="config.props" />\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>\r
+    <RootNamespace>NetHackW</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <Import Project="default.props" />\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="common.props" />\r
+  <Import Project="dirs.props" />\r
+  <Import Project="files.props" />\r
+  <PropertyGroup>\r
+    <OutDir>$(BinDir)</OutDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <OmitFramePointers>true</OmitFramePointers>\r
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="$(SrcDir)allmain.c" />\r
+    <ClCompile Include="$(SrcDir)alloc.c" />\r
+    <ClCompile Include="$(SrcDir)apply.c" />\r
+    <ClCompile Include="$(SrcDir)artifact.c" />\r
+    <ClCompile Include="$(SrcDir)attrib.c" />\r
+    <ClCompile Include="$(SrcDir)ball.c" />\r
+    <ClCompile Include="$(SrcDir)bones.c" />\r
+    <ClCompile Include="$(SrcDir)botl.c" />\r
+    <ClCompile Include="$(SrcDir)cmd.c" />\r
+    <ClCompile Include="$(SrcDir)dbridge.c" />\r
+    <ClCompile Include="$(SrcDir)decl.c" />\r
+    <ClCompile Include="$(SrcDir)detect.c" />\r
+    <ClCompile Include="$(SrcDir)dig.c" />\r
+    <ClCompile Include="$(SrcDir)display.c" />\r
+    <ClCompile Include="$(SrcDir)dlb.c" />\r
+    <ClCompile Include="$(SrcDir)do.c" />\r
+    <ClCompile Include="$(SrcDir)dog.c" />\r
+    <ClCompile Include="$(SrcDir)dogmove.c" />\r
+    <ClCompile Include="$(SrcDir)dokick.c" />\r
+    <ClCompile Include="$(SrcDir)dothrow.c" />\r
+    <ClCompile Include="$(SrcDir)do_name.c" />\r
+    <ClCompile Include="$(SrcDir)do_wear.c" />\r
+    <ClCompile Include="$(SrcDir)drawing.c" />\r
+    <ClCompile Include="$(SrcDir)dungeon.c" />\r
+    <ClCompile Include="$(SrcDir)eat.c" />\r
+    <ClCompile Include="$(SrcDir)end.c" />\r
+    <ClCompile Include="$(SrcDir)engrave.c" />\r
+    <ClCompile Include="$(SrcDir)exper.c" />\r
+    <ClCompile Include="$(SrcDir)explode.c" />\r
+    <ClCompile Include="$(SrcDir)extralev.c" />\r
+    <ClCompile Include="$(SrcDir)files.c" />\r
+    <ClCompile Include="$(SrcDir)fountain.c" />\r
+    <ClCompile Include="$(SrcDir)hack.c" />\r
+    <ClCompile Include="$(SrcDir)hacklib.c" />\r
+    <ClCompile Include="$(SrcDir)invent.c" />\r
+    <ClCompile Include="$(SrcDir)light.c" />\r
+    <ClCompile Include="$(SrcDir)lock.c" />\r
+    <ClCompile Include="$(SrcDir)mail.c" />\r
+    <ClCompile Include="$(SrcDir)makemon.c" />\r
+    <ClCompile Include="$(SrcDir)mapglyph.c" />\r
+    <ClCompile Include="$(SrcDir)mcastu.c" />\r
+    <ClCompile Include="$(SrcDir)mhitm.c" />\r
+    <ClCompile Include="$(SrcDir)mhitu.c" />\r
+    <ClCompile Include="$(SrcDir)minion.c" />\r
+    <ClCompile Include="$(SrcDir)mklev.c" />\r
+    <ClCompile Include="$(SrcDir)mkmap.c" />\r
+    <ClCompile Include="$(SrcDir)mkmaze.c" />\r
+    <ClCompile Include="$(SrcDir)mkobj.c" />\r
+    <ClCompile Include="$(SrcDir)mkroom.c" />\r
+    <ClCompile Include="$(SrcDir)mon.c" />\r
+    <ClCompile Include="$(SrcDir)mondata.c" />\r
+    <ClCompile Include="$(SrcDir)monmove.c" />\r
+    <ClCompile Include="$(SrcDir)monst.c" />\r
+    <ClCompile Include="$(SrcDir)mplayer.c" />\r
+    <ClCompile Include="$(SrcDir)mthrowu.c" />\r
+    <ClCompile Include="$(SrcDir)muse.c" />\r
+    <ClCompile Include="$(SrcDir)music.c" />\r
+    <ClCompile Include="$(SrcDir)objects.c" />\r
+    <ClCompile Include="$(SrcDir)objnam.c" />\r
+    <ClCompile Include="$(SrcDir)options.c" />\r
+    <ClCompile Include="$(SrcDir)o_init.c" />\r
+    <ClCompile Include="$(SrcDir)pager.c" />\r
+    <ClCompile Include="$(SrcDir)pickup.c" />\r
+    <ClCompile Include="$(SrcDir)pline.c" />\r
+    <ClCompile Include="$(SrcDir)polyself.c" />\r
+    <ClCompile Include="$(SrcDir)potion.c" />\r
+    <ClCompile Include="$(SrcDir)pray.c" />\r
+    <ClCompile Include="$(SrcDir)priest.c" />\r
+    <ClCompile Include="$(SrcDir)quest.c" />\r
+    <ClCompile Include="$(SrcDir)questpgr.c" />\r
+    <ClCompile Include="$(SrcDir)read.c" />\r
+    <ClCompile Include="$(SrcDir)rect.c" />\r
+    <ClCompile Include="$(SrcDir)region.c" />\r
+    <ClCompile Include="$(SrcDir)restore.c" />\r
+    <ClCompile Include="$(SrcDir)rip.c" />\r
+    <ClCompile Include="$(SrcDir)rnd.c" />\r
+    <ClCompile Include="$(SrcDir)role.c" />\r
+    <ClCompile Include="$(SrcDir)rumors.c" />\r
+    <ClCompile Include="$(SrcDir)save.c" />\r
+    <ClCompile Include="$(SrcDir)shk.c" />\r
+    <ClCompile Include="$(SrcDir)shknam.c" />\r
+    <ClCompile Include="$(SrcDir)sit.c" />\r
+    <ClCompile Include="$(SrcDir)sounds.c" />\r
+    <ClCompile Include="$(SrcDir)spell.c" />\r
+    <ClCompile Include="$(SrcDir)sp_lev.c" />\r
+    <ClCompile Include="$(SrcDir)steal.c" />\r
+    <ClCompile Include="$(SrcDir)steed.c" />\r
+    <ClCompile Include="$(SrcDir)sys.c" />\r
+    <ClCompile Include="$(SrcDir)teleport.c" />\r
+    <ClCompile Include="$(SrcDir)tile.c" />\r
+    <ClCompile Include="$(SrcDir)timeout.c" />\r
+    <ClCompile Include="$(SrcDir)topten.c" />\r
+    <ClCompile Include="$(SrcDir)track.c" />\r
+    <ClCompile Include="$(SrcDir)trap.c" />\r
+    <ClCompile Include="$(SrcDir)uhitm.c" />\r
+    <ClCompile Include="$(SrcDir)u_init.c" />\r
+    <ClCompile Include="$(SrcDir)vault.c" />\r
+    <ClCompile Include="$(SrcDir)version.c" />\r
+    <ClCompile Include="$(SrcDir)vision.c" />\r
+    <ClCompile Include="$(SrcDir)vis_tab.c" />\r
+    <ClCompile Include="$(SrcDir)weapon.c" />\r
+    <ClCompile Include="$(SrcDir)were.c" />\r
+    <ClCompile Include="$(SrcDir)wield.c" />\r
+    <ClCompile Include="$(SrcDir)windows.c" />\r
+    <ClCompile Include="$(SrcDir)wizard.c" />\r
+    <ClCompile Include="$(SrcDir)worm.c" />\r
+    <ClCompile Include="$(SrcDir)worn.c" />\r
+    <ClCompile Include="$(SrcDir)write.c" />\r
+    <ClCompile Include="$(SrcDir)zap.c" />\r
+    <ClCompile Include="$(SysShareDir)cppregex.cpp" />\r
+    <ClCompile Include="$(SysShareDir)nhlan.c" />\r
+    <ClCompile Include="$(SysShareDir)pcmain.c" />\r
+    <ClCompile Include="$(SysShareDir)pcsys.c" />\r
+    <ClCompile Include="$(SysShareDir)pcunix.c" />\r
+    <ClCompile Include="$(SysShareDir)random.c" />\r
+    <ClCompile Include="$(SysWinntDir)ntsound.c" />\r
+    <ClCompile Include="$(SysWinntDir)stubs.c">\r
+      <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <ClCompile Include="$(SysWinntDir)winnt.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhfont.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhinput.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmain.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmap.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmenu.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhmsgwnd.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhrip.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhsplash.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhstatus.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mhtext.c" />\r
+    <ClCompile Include="$(WinWin32Dir)mswproc.c" />\r
+    <ClCompile Include="$(WinWin32Dir)winhack.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <Target Name="AfterBuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterClean">\r
+    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+  <Target Name="AfterRebuild">\r
+    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
+  </Target>\r
+</Project>\r
diff --git a/win/win32/vs2017/files.props b/win/win32/vs2017/files.props
index e40a34cb90d0c4577570a14217c566731b030d77..483ec1eb19781b77a92a626962f2793dcf45949f 100644 (file)
--- a/win/win32/vs2017/files.props
+++ b/win/win32/vs2017/files.props
@@ -8,8 +8,6 @@
     <Defs Include = "$(IncDir)onames.h"/>
        <!-- -p -->
     <Defs Include = "$(IncDir)pm.h"/>
-       <!-- -m -->
-    <Defs Include = "$(SrcDir)monstr.c"/>
        <!-- -z -->
     <Defs Include = "$(IncDir)vis_tab.h"/>
     <Defs Include = "$(SrcDir)vis_tab.c"/>
Unnamed repository; edit this file 'description' to name the repository.