Merge branch 'NetHack-3.6'

include/dlb.h

@@ -37,7 +37,15 @@ typedef struct dlb_library {
 
 /* library definitions */
 #ifndef DLBFILE
+#ifndef VERSION_IN_DLB_FILENAME
 #define DLBFILE "nhdat" /* name of library */
+#else
+#define MAX_DLB_FILENAME 256
+#define DLBFILE dlbfilename
+#define DLBBASENAME "nhdat"
+extern char dlbfilename[MAX_DLB_FILENAME];
+extern char *FDECL(build_dlb_filename, (const char *));
+#endif
 #endif
 #ifndef FILENAME_CMP
 #define FILENAME_CMP strcmp /* case sensitive */

include/ntconf.h

@@ -43,6 +43,8 @@
 /* #define SHORT_FILENAMES */ /* All NT filesystems support long names now
  */
 
+#define VERSION_IN_DLB_FILENAME     /* Append version digits to nhdat */
+
 #ifdef MICRO
 #undef MICRO /* never define this! */
 #endif

src/dlb.c

@@ -4,6 +4,9 @@
 
 #include "config.h"
 #include "dlb.h"
+#if defined(VERSION_IN_DLB_FILENAME)
+#include "patchlevel.h"
+#endif
 
 #ifdef __DJGPP__
 #include <string.h>
@@ -38,6 +41,10 @@ typedef struct dlb_procs {
     long FDECL((*dlb_ftell_proc), (DLB_P));
 } dlb_procs_t;
 
+#if defined(VERSION_IN_DLB_FILENAME)
+char dlbfilename[MAX_DLB_FILENAME];
+#endif
+
 /* without extern.h via hack.h, these haven't been declared for us */
 extern FILE *FDECL(fopen_datafile, (const char *, const char *, int));
 
@@ -240,7 +247,9 @@ lib_dlb_init(VOID_ARGS)
 {
     /* zero out array */
     (void) memset((char *) &dlb_libs[0], 0, sizeof(dlb_libs));
-
+#ifdef VERSION_IN_DLB_FILENAME
+    build_dlb_filename((const char *) 0);
+#endif
     /* To open more than one library, add open library calls here. */
     if (!open_library(DLBFILE, &dlb_libs[0]))
         return FALSE;
@@ -263,6 +272,17 @@ lib_dlb_cleanup(VOID_ARGS)
         close_library(&dlb_libs[i]);
 }
 
+#ifdef VERSION_IN_DLB_FILENAME
+char *
+build_dlb_filename(lf)
+const char *lf;
+{
+    Sprintf(dlbfilename, "%s%d%d%d",
+            lf ? lf : DLBBASENAME, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL);
+    return dlbfilename;
+}
+#endif
+
 /*ARGSUSED*/
 STATIC_OVL boolean
 lib_dlb_fopen(dp, name, mode)

sys/winnt/Makefile.msc

@@ -671,7 +671,7 @@ install: $(O)envchk.tag $(O)obj.tag $(O)utility.tag $(GAMEDIR)\NetHack.exe $(GAM
 $(O)install.tag: 	$(DAT)\data	$(DAT)\rumors	 $(DAT)\dungeon \
 	 	$(DAT)\oracles	$(DAT)\quest.dat $(O)sp_lev.tag $(DLB)
 ! IF ("$(USE_DLB)"=="Y")
-	copy nhdat                $(GAMEDIR)
+	copy nhdat*               $(GAMEDIR)
 	copy $(DAT)\license       $(GAMEDIR)
 	copy $(DAT)\opthelp       $(GAMEDIR)
 ! ELSE
@@ -1279,7 +1279,7 @@ spotless: clean
 	if exist $(GAMEDIR)\nhraykey.dll del $(GAMEDIR)\nhraykey.dll
 	if exist $(GAMEDIR)\NetHack.exe  del $(GAMEDIR)\NetHack.exe
 	if exist $(GAMEDIR)\NetHack.pdb  del $(GAMEDIR)\NetHack.pdb
-	if exist $(GAMEDIR)\nhdat        del $(GAMEDIR)\nhdat
+	if exist $(GAMEDIR)\nhdat*       del $(GAMEDIR)\nhdat*
 ! ENDIF
 	if exist $(INCL)\date.h          del $(INCL)\date.h
 	if exist $(INCL)\onames.h        del $(INCL)\onames.h
@@ -1332,7 +1332,7 @@ spotless: clean
 	if exist $(DAT)\porthelp	 del $(DAT)\porthelp
 	if exist $(O)sp_lev.tag	         del $(O)sp_lev.tag
 	if exist $(SRC)\vis_tab.c        del $(SRC)\vis_tab.c
-	if exist nhdat.			 del nhdat.
+	if exist nhdat*.	         del nhdat*.
 	if exist $(O)obj.tag             del $(O)obj.tag
 	if exist $(O)gamedir.tag         del $(O)gamedir.tag
 	if exist $(O)nh*key.lib          del $(O)nh*key.lib

util/dlb_main.c

@@ -198,6 +198,9 @@ char **argv;
             if (ap == argc)
                 usage();
             library_file = argv[ap++];
+#ifdef VERSION_IN_DLB_FILENAME
+            library_file = build_dlb_filename(library_file);
+#endif
             if (fseen)
                 printf("Warning: multiple f options.  Previous ignored.\n");
             fseen = 1;

util/makedefs.c

@@ -1522,7 +1522,11 @@ static const char *build_opts[] = {
     "ZLIB data file compression",
 #endif
 #ifdef DLB
+#ifndef VERSION_IN_DLB_FILENAME
     "data librarian",
+#else
+    "data librarian with a version-dependent name",
+#endif
 #endif
 #ifdef DUMPLOG
     "end-of-game dumplogs",

win/win32/vs2017/NetHack.sln

@@ -80,6 +80,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
+	ProjectSection(SolutionItems) = preProject
+		NetHackProperties.props = NetHackProperties.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -204,4 +209,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6DF8F690-552A-4329-8FAB-DD447071A473}
+	EndGlobalSection
 EndGlobal

win/win32/vs2017/NetHack.vcxproj

@@ -9,6 +9,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />
@@ -19,12 +31,12 @@
   <ItemDefinitionGroup Condition="Exists('$(PDCURSES)')">
     <ClCompile>
       <AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-	  <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-	<Link>
+    <Link>
       <AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>PDCurses.lib;%(AdditionalDependencies)</AdditionalDependencies>
-	  </Link>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>

win/win32/vs2017/NetHackProperties.props

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <VERSION_MAJOR>3</VERSION_MAJOR>
+    <VERSION_MINOR>6</VERSION_MINOR>
+    <PATCHLEVEL>3</PATCHLEVEL>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="VERSION_MAJOR">
+      <Value>$(VERSION_MAJOR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="VERSION_MINOR">
+      <Value>$(VERSION_MINOR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="PATCHLEVEL">
+      <Value>$(PATCHLEVEL)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

win/win32/vs2017/NetHackW.vcxproj

@@ -8,6 +8,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />

win/win32/vs2017/afterdlb.proj

@@ -3,7 +3,7 @@
   <Import Project="files.props"/>
   <Target Name="Build"
 	Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp"
-	Outputs="$(BinDir)nhdat">
+	Outputs="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
 
  	<Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/>
 	<WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/>
@@ -12,6 +12,6 @@
 
 	</Target>
   <Target Name="Clean">
-	<Delete Files="$(BinDir)nhdat"/>
+	<Delete Files="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)"/>
   </Target>
 </Project>

win/win32/vs2017/dgncomp.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/dlb.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/levcomp.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/makedefs.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/nh340key.vcxproj

@@ -9,6 +9,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default_dll.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="dll.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/nhdefkey.vcxproj

@@ -9,6 +9,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default_dll.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="dll.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/nhraykey.vcxproj

@@ -9,6 +9,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default_dll.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="dll.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/recover.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/tile2bmp.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/tilemap.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />

win/win32/vs2017/uudecode.vcxproj

@@ -7,6 +7,18 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="NetHackProperties.props" />
+  </ImportGroup>
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />