Visual Studio 2015 build improvements.

2017-08-28 22:32:16 -07:00
parent 5a4df357ab
commit e5dadd525f
15 changed files with 76 additions and 52 deletions
--- a/win/win32/.gitignore
+++ b/win/win32/.gitignore
@@ -2,4 +2,4 @@
 *.bmp
 *.ico
 *.db
-
+record
--- a/win/win32/nethack.rc
+++ b/win/win32/nethack.rc
@@ -0,0 +1,14 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_NETHACKW            ICON    DISCARDABLE     "NETHACK.ICO"
+
+
--- a/win/win32/vs2015/NetHack.vcxproj
+++ b/win/win32/vs2015/NetHack.vcxproj
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.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="$(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>
@@ -31,7 +32,6 @@
      <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" />
@@ -215,8 +215,11 @@
    <ClInclude Include="$(IncDir)you.h" />
    <ClInclude Include="$(IncDir)youprop.h" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Target Name="AfterBuild">
+  <Target Name="AfterBuild">
    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
  </Target>
  <Target Name="AfterClean">
@@ -225,4 +228,4 @@
  <Target Name="AfterRebuild">
    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
  </Target>
- </Project>
+</Project>
--- a/win/win32/vs2015/NetHackW.vcxproj
+++ b/win/win32/vs2015/NetHackW.vcxproj
@@ -14,6 +14,10 @@
  <Import Project="dirs.props" />
  <Import Project="files.props" />

+  <PropertyGroup>
+    <OutDir>$(BinDir)</OutDir>
+  </PropertyGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
--- a/win/win32/vs2015/afterdgncomp.proj
+++ b/win/win32/vs2015/afterdgncomp.proj
@@ -2,9 +2,9 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-     Inputs="$(BinDir)dgncomp.exe;$(DatDir)dungeon.pdf"
+     Inputs="$(ToolsDir)dgncomp.exe;$(DatDir)dungeon.pdf"
 	 Outputs="$(DatDir)dungeon">
-	<Exec Command="$(BinDir)dgncomp.exe dungeon.pdf" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)dgncomp.exe dungeon.pdf" WorkingDirectory="$(DatDir)"/>
  </Target>
  <Target Name="Clean">
 	<Delete Files="$(DatDir)dungeon"/>
--- a/win/win32/vs2015/afterdlb.proj
+++ b/win/win32/vs2015/afterdlb.proj
@@ -2,12 +2,12 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-	Inputs="$(BinDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp"
+	Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp"
 	Outputs="$(BinDir)nhdat">

 	<Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/>
 	<WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/>
-	<Exec Command="$(BinDir)dlb.exe cIf $(DatDir)dlb.lst $(BinDir)nhdat" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)dlb.exe cIf $(DatDir)dlb.lst $(BinDir)nhdat" WorkingDirectory="$(DatDir)"/>
 	<Delete Files="$(DatDir)porthelp"/>

 	</Target>
--- a/win/win32/vs2015/afterlevcomp.proj
+++ b/win/win32/vs2015/afterlevcomp.proj
@@ -4,7 +4,7 @@
  <Target Name="Build" 
     Inputs="@(Desfiles->'$(DatDir)%(filename)%(extension)');$(BinDir)levcomp.exe"
 	 Outputs="@(Levfiles->'$(DatDir)%(filename)%(extension)')">
-	<Exec Command="$(BinDir)levcomp.exe @(Desfiles, ' ')" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)levcomp.exe @(Desfiles, ' ')" WorkingDirectory="$(DatDir)"/>
  </Target>
  <Target Name="Clean">
 	<Delete Files="@(Levfiles->'$(DatDir)%(filename)%(extension)')"/>
--- a/win/win32/vs2015/aftermakedefs.proj
+++ b/win/win32/vs2015/aftermakedefs.proj
@@ -2,19 +2,19 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-     Inputs="$(BinDir)makedefs.exe"
+     Inputs="$(ToolsDir)makedefs.exe"
 	 Outputs="@(Defs)">
-	<Exec Command="$(BinDir)makedefs.exe -v" WorkingDirectory="$(UtilDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -o" WorkingDirectory="$(UtilDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -p" WorkingDirectory="$(UtilDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -m" WorkingDirectory="$(UtilDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -z" WorkingDirectory="$(UtilDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -d" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -r" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -s" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -q" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -h" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(BinDir)makedefs.exe -e" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -v" WorkingDirectory="$(UtilDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -o" WorkingDirectory="$(UtilDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -p" WorkingDirectory="$(UtilDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -m" WorkingDirectory="$(UtilDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -z" WorkingDirectory="$(UtilDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -d" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -r" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -s" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -q" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -h" WorkingDirectory="$(DatDir)"/>
+	<Exec Command="$(ToolsDir)makedefs.exe -e" WorkingDirectory="$(DatDir)"/>
  </Target>
  <Target Name="Clean">
 	<Delete Files="@(Defs)"/>
--- a/win/win32/vs2015/afternethack.proj
+++ b/win/win32/vs2015/afternethack.proj
@@ -3,13 +3,13 @@
  <Import Project="files.props"/>
  <!-- TODO not copying record -->
  <Target Name="Build" 
-	Inputs="$(SysWinntDir)defaults.nh;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf;$(DocDir)nethack.txt"
-	Outputs="$(BinDir)defaults.nh;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf;">
+	Inputs="$(SysWinntDir)defaults.nh;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
+	Outputs="$(BinDir)defaults.nh;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf;$(BinDir)symbols;$(BinDir)record;$(BinDir)opthelp">

-	<Copy SourceFiles="$(SysWinntDir)defaults.nh;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf;$(DocDir)nethack.txt" DestinationFolder="$(BinDir)"/>
+	<Copy SourceFiles="$(SysWinntDir)defaults.nh;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp" DestinationFolder="$(BinDir)"/>

 	</Target>
  <Target Name="Clean">
-	<Delete Files="$(BinDir)defaults.nh;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf;$(BinDir)nethack.txt;"/>
+	<Delete Files="$(BinDir)defaults.nh;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf;$(BinDir)nethack.txt;$(BinDir)symbols;$(BinDir)record;$(BinDir)opthelp"/>
  </Target>
 </Project>
--- a/win/win32/vs2015/aftertile2bmp.proj
+++ b/win/win32/vs2015/aftertile2bmp.proj
@@ -2,9 +2,9 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-     Inputs="$(BinDir)tile2bmp.exe;$(WinShareDir)monsters.txt;$(WinShareDir)objects.txt"
+     Inputs="$(ToolsDir)tile2bmp.exe;$(WinShareDir)monsters.txt;$(WinShareDir)objects.txt"
 	 Outputs="$(WinWin32Dir)tiles.bmp">
-	<Exec Command="$(BinDir)tile2bmp.exe tiles.bmp" WorkingDirectory="$(SrcDir)"/>
+	<Exec Command="$(ToolsDir)tile2bmp.exe tiles.bmp" WorkingDirectory="$(SrcDir)"/>
 	<Move SourceFiles="$(SrcDir)tiles.bmp" DestinationFolder="$(WinWin32Dir)"/>
  </Target>
  <Target Name="Clean">
--- a/win/win32/vs2015/aftertilemap.proj
+++ b/win/win32/vs2015/aftertilemap.proj
@@ -2,9 +2,9 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-     Inputs="$(BinDir)tilemap.exe"
+     Inputs="$(ToolsDir)tilemap.exe"
 	 Outputs="$(SrcDir)tile.c">
-	<Exec Command="$(BinDir)tilemap.exe" WorkingDirectory="$(SrcDir)"/>
+	<Exec Command="$(ToolsDir)tilemap.exe" WorkingDirectory="$(SrcDir)"/>
  </Target>
  <Target Name="Clean">
 	<Delete Files="$(SrcDir)tile.c"/>
--- a/win/win32/vs2015/afteruudecode.proj
+++ b/win/win32/vs2015/afteruudecode.proj
@@ -2,18 +2,19 @@
  <Import Project="dirs.props"/>
  <Import Project="files.props"/>
  <Target Name="Build" 
-     Inputs="$(BinDir)uudecode.exe;@(UUFiles)"
-	 Outputs="@(IconFiles);@(BmpFiles)">
-	<Exec Command="$(BinDir)uudecode.exe $(SysWinntDir)nhico.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)mnsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)mnselcnt.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)mnunsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)petmark.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)pilemark.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)splash.uu" WorkingDirectory="$(WinWin32Dir)"/>
-	<Exec Command="$(BinDir)uudecode.exe $(WinWin32Dir)rip.uu" WorkingDirectory="$(WinWin32Dir)"/>
+     Inputs="$(ToolsDir)uudecode.exe;@(UUFiles)"
+	 Outputs="@(IconFiles);@(BmpFiles);@(RecordFiles)">
+	<Exec Command="$(ToolsDir)uudecode.exe $(SysWinntDir)nhico.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnselcnt.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)mnunsel.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)petmark.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)pilemark.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)splash.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)rip.uu" WorkingDirectory="$(WinWin32Dir)"/>
+	<Exec Command="$(ToolsDir)uudecode.exe $(WinWin32Dir)record.uu" WorkingDirectory="$(WinWin32Dir)"/>
  </Target>
  <Target Name="Clean">
-	<Delete Files="@(IconFiles);@(BmpFiles)"/>
+	<Delete Files="@(IconFiles);@(BmpFiles);@(RecordFiles)"/>
  </Target>
 </Project>
--- a/win/win32/vs2015/common.props
+++ b/win/win32/vs2015/common.props
@@ -15,6 +15,7 @@
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
+      <ProgramDatabaseFile>$(SymbolsDir)$(TargetName).pdb</ProgramDatabaseFile>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
--- a/win/win32/vs2015/dirs.props
+++ b/win/win32/vs2015/dirs.props
@@ -2,10 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <RootDir>$(MSBuildProjectDirectory)\..\..\..\</RootDir>
-    <UtilDir>$(RootDir)util\</UtilDir>
+    <BinDir>$(RootDir)bin\$(Configuration)\$(Platform)\</BinDir>
    <ObjDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\</ObjDir>
-    <OutDir>$(RootDir)bin\$(Configuration)\$(Platform)\</OutDir>
-	<IntDir>$(RootDir)obj\$(Configuration)\$(Platform)\$(TargetName)\</IntDir>
+    <SymbolsDir>$(ProjectDir)symbols\$(Configuration)\$(Platform)\$(TargetName)\</SymbolsDir>
+    <ToolsDir>$(RootDir)tools\$(Configuration)\$(Platform)\</ToolsDir>
+    <UtilDir>$(RootDir)util\</UtilDir>
    <DatDir>$(RootDir)dat\</DatDir>
    <DocDir>$(RootDir)doc\</DocDir>
    <IncDir>$(RootDir)include\</IncDir>
@@ -17,6 +18,7 @@
    <WinShareDir>$(RootDir)win\share\</WinShareDir>
    <WinTtyDir>$(RootDir)win\tty\</WinTtyDir>
    <WinWin32Dir>$(RootDir)win\win32\</WinWin32Dir>
-    <BinDir>$(OutDir)</BinDir>
+    <OutDir>$(ToolsDir)</OutDir>
+	<IntDir>$(ObjDir)</IntDir>
  </PropertyGroup>
 </Project>
--- a/win/win32/vs2015/recover.vcxproj
+++ b/win/win32/vs2015/recover.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="config.props" />
-
  <PropertyGroup Label="Globals">
    <ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid>
  </PropertyGroup>
-
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,14 +11,15 @@
  <Import Project="common.props" />
  <Import Project="dirs.props" />
  <Import Project="files.props" />
-
+  <PropertyGroup>
+    <OutDir>$(BinDir)</OutDir>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
-
  <ItemGroup>
    <ClCompile Include="$(UtilDir)recover.c" />
  </ItemGroup>