Visual Studio 2015 build improvements.

diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt
index a9b2201b02731d5f205c097804678f68e6ece2f8..c6e5643b770f5423ac00d8f3f0feae5f3a9a7f0f 100644 (file)
--- a/sys/winnt/Install.nt
+++ b/sys/winnt/Install.nt
@@ -21,6 +21,10 @@ tty and graphical win32 versions of NetHack 3.6.1.
 You can build a TTY version of NetHack and a Windows Graphical 
 version.  You can use one of the following build environments:
 
+  o A copy of Microsoft Visual Studio 2015 Express
+
+       OR
+
   o A copy of Microsoft Visual Studio 2013 Express
     The current NetHack code has not been tested with earlier versions 
     of the compiler.
@@ -34,12 +38,35 @@ version.  You can use one of the following build environments:
         http://www.mingw.org/
     Earlier versions of MinGW will not allow you to build the Windows
     Graphical version.
-    
+
+
 In addition to the makefiles that allow you to build NetHack from the
 command line, there is also a set of project files and a workspace file
 that allow you to build the Windows Graphical version from Microsoft
 Visual C's IDE (Integrated Development Environment.)
 
+/-------------------------------------------------------\
+| Buildig And Running Using Visual Studio 2015          |
+\-------------------------------------------------------/
+
+If you are NOT using Visual Studio 2015, proceed to "FIRST STEP -
+MOVING THINGS AROUND".
+
+When using Visual Studio 2015, you do not need to move things around.
+You simply need to load the Visual Studio 2015 NetHack solution file
+within the IDE, build the solution and run the version of NetHack
+you wish to run.
+
+The Visual Studio 2015 NetHack solution file can be found here:
+    win\win32\vs2015\NetHack.sln
+
+From a command prompt, you can launch and load this solution file by:
+       start win\win32\vs2015\NetHack.sln
+
+From within the IDE:
+       1. select the build configuration you wish to use.
+       2. from build menu, select build solution.
+       3. type F5 to start debugging.
 
 /-----------------------------------\
 | FIRST STEP - MOVING THINGS AROUND |

diff --git a/win/win32/.gitignore b/win/win32/.gitignore
index 5f3465e5f18eac0e0192b9b4011bda1d687e0d3c..670e92b59800ca1218b03873a88447efe6e9ea3b 100644 (file)
--- a/win/win32/.gitignore
+++ b/win/win32/.gitignore
@@ -4,4 +4,5 @@
 *.db
 record
 *.user
+*.opendb
 

diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props
index 2504e3912cc199085d0f6fc624b49c299ae70fc2..5a5b2ed2eaef844792a1548100d48b0d0fdff6f1 100644 (file)
--- a/win/win32/vs2015/common.props
+++ b/win/win32/vs2015/common.props
@@ -34,5 +34,8 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file

diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj
index 31fd7d7cc3377d57df23cd3f9e683e1bb4b12fb8..f77c26ad33a04de2b948d3b72585bd0d6f5bd669 100755 (executable)
--- a/win/win32/vs2015/nhdefkey.vcxproj
+++ b/win/win32/vs2015/nhdefkey.vcxproj
@@ -1,13 +1,11 @@
 <?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" />
-
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>nhdefkey</RootNamespace>\r
   </PropertyGroup>\r
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="default_dll.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
@@ -15,17 +13,18 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-  
+  <PropertyGroup>
+    <OutDir>$(BinDir)</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>\r
-      <PreprocessorDefinitions>NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>nhdefkey.def</ModuleDefinitionFile>
+      <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
     </Link>\r
   </ItemDefinitionGroup>\r
-
   <ItemGroup>\r
     <ClCompile Include="$(SysWinntDir)nhdefkey.c" />
   </ItemGroup>\r

diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt
index c63113fd9c6db34e6f1c9854bd68ef89e53c7eb5..cdcba3334879ec02dc18cab01ded704d67583b32 100644 (file)
--- a/win/win32/vs2015/notes.txt
+++ b/win/win32/vs2015/notes.txt
@@ -1,5 +1,9 @@
 Changes made to vs2015 build
 
+To Do
+1. Build other key handler DLLs.
+2. Ensure Release build does not have unexpected files after clean build.
+
 Changes
 1. Removed the use of /FS.
 2. Allow multi-processor compilation.