diff --git a/win/win32/.gitignore b/win/win32/.gitignore
index c40993f47..ad63feee5 100644
--- a/win/win32/.gitignore
+++ b/win/win32/.gitignore
@@ -1,4 +1,5 @@
# Build-generated stuff that we don't want
*.bmp
*.ico
+*.db
diff --git a/win/win32/vs2015/NetHack.sln b/win/win32/vs2015/NetHack.sln
index 3b335b62f..c2cf16ff5 100755
--- a/win/win32/vs2015/NetHack.sln
+++ b/win/win32/vs2015/NetHack.sln
@@ -1,63 +1,69 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
ProjectSection(ProjectDependencies) = postProject
+ {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
+ {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
+ {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
+ {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
+ {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
+ {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
+ {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcxproj", "{B9E02F2C-8851-442B-BF2A-3581802B78D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}"
ProjectSection(ProjectDependencies) = postProject
- {FF144DFB-83A5-4D26-A598-715A2B354782} = {FF144DFB-83A5-4D26-A598-715A2B354782}
+ {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
ProjectSection(ProjectDependencies) = postProject
- {B9E02F2C-8851-442B-BF2A-3581802B78D4} = {B9E02F2C-8851-442B-BF2A-3581802B78D4}
+ {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
+ {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
+ {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
+ {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcxproj", "{FF144DFB-83A5-4D26-A598-715A2B354782}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
+ EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "build\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
ProjectSection(ProjectDependencies) = postProject
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
+ {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "build\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
ProjectSection(ProjectDependencies) = postProject
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiles", "build\tiles.vcxproj", "{55946465-FC65-47B3-BB48-742C7694C0D6}"
- ProjectSection(ProjectDependencies) = postProject
- {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "build\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "build\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
ProjectSection(ProjectDependencies) = postProject
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
+ {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "build\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection
@@ -86,14 +92,6 @@ Global
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.Build.0 = Release|Win32
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.ActiveCfg = Release|x64
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.Build.0 = Release|x64
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|Win32.ActiveCfg = Debug|Win32
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|Win32.Build.0 = Debug|Win32
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|x64.ActiveCfg = Debug|x64
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|x64.Build.0 = Debug|x64
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|Win32.ActiveCfg = Release|Win32
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|Win32.Build.0 = Release|Win32
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|x64.ActiveCfg = Release|x64
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|x64.Build.0 = Release|x64
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.ActiveCfg = Debug|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.Build.0 = Debug|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.ActiveCfg = Debug|x64
@@ -110,14 +108,6 @@ Global
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.Build.0 = Release|Win32
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.ActiveCfg = Release|x64
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.Build.0 = Release|x64
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|Win32.ActiveCfg = Debug|Win32
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|Win32.Build.0 = Debug|Win32
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|x64.ActiveCfg = Debug|x64
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|x64.Build.0 = Debug|x64
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|Win32.ActiveCfg = Release|Win32
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|Win32.Build.0 = Release|Win32
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|x64.ActiveCfg = Release|x64
- {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|x64.Build.0 = Release|x64
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.ActiveCfg = Debug|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.Build.0 = Debug|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.ActiveCfg = Debug|x64
@@ -150,14 +140,6 @@ Global
{93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.Build.0 = Release|Win32
{93F10526-209E-41D7-BBEA-775787876895}.Release|x64.ActiveCfg = Release|x64
{93F10526-209E-41D7-BBEA-775787876895}.Release|x64.Build.0 = Release|x64
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|Win32.ActiveCfg = Debug|Win32
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|Win32.Build.0 = Debug|Win32
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|x64.ActiveCfg = Debug|x64
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|x64.Build.0 = Debug|x64
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|Win32.ActiveCfg = Release|Win32
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|Win32.Build.0 = Release|Win32
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|x64.ActiveCfg = Release|x64
- {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|x64.Build.0 = Release|x64
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.ActiveCfg = Debug|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.Build.0 = Debug|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/win/win32/vs2015/NetHack.vcxproj b/win/win32/vs2015/NetHack.vcxproj
index 6826894e3..b9f29c289 100755
--- a/win/win32/vs2015/NetHack.vcxproj
+++ b/win/win32/vs2015/NetHack.vcxproj
@@ -1,492 +1,228 @@
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
+
+
+
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}
Win32Proj
NetHack
-
-
- Application
- true
- v140
- MultiByte
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- v140
- true
- MultiByte
-
-
- Application
- false
- MultiByte
- v140
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\Release\
- .\Release\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\Debug\
- .\Debug\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
+
+
+
+
+
+
- /Gs /Oi- /FS %(AdditionalOptions)
+ /Gs /Oi- %(AdditionalOptions)
Disabled
- Level3
Default
Speed
true
- MaxSpeed
- true
- false
- TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- true
- MultiThreaded
- true
- .\Release/NetHack.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
+ $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)
+ TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions)
- Console
- true
- true
- true
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)
- true
- true
- .\Release/NetHack.pdb
- true
- .\Release/NetHack.map
-
-
- MachineX86
- true
-
- true
- .\Release/NetHack.bsc
-
-
- Install exe
-
- copy $(OutDir)NetHack.exe ..\binary
- copy ..\dat\nhdat ..\binary
- copy ..\dat\license ..\binary
- if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
- if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
- if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
- copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
- if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- /Gs /Oi- /FS %(AdditionalOptions)
- Disabled
- Level3
- Default
- Speed
- true
- MaxSpeed
- true
- false
- TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- true
- MultiThreaded
- true
- .\Release/NetHack.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
-
-
- Console
- true
- true
- true
- 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;%(AdditionalDependencies)
- true
- true
- .\Release/NetHack.pdb
- true
- .\Release/NetHack.map
-
-
-
-
- true
- .\Release/NetHack.bsc
-
-
- Install exe
-
- copy $(OutDir)NetHack.exe ..\binary
- copy ..\dat\nhdat ..\binary
- copy ..\dat\license ..\binary
- if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
- if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
- if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
- copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
- if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- /Gs /Oi- /FS %(AdditionalOptions)
- Disabled
- Default
- Speed
- true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;NDEBUG;WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- true
- true
- MultiThreadedDebug
- true
- .\Debug/NetHack.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
-
-
- .\Release/NetHack.pdb
- true
- .\Release/NetHack.map
- Console
- true
- 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;%(AdditionalDependencies)
- MachineX86
-
-
- true
- .\Debug/NetHack.bsc
-
-
- Install exe
-
- if NOT exist ..\binary\*.* mkdir ..\binary
- copy $(OutDir)NetHack.exe ..\binary
- copy ..\dat\nhdat ..\binary
- copy ..\dat\license ..\binary
- copy ..\dat\symbols ..\binary
- if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
- if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
- if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
- copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
- if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- /Gs /Oi- /FS %(AdditionalOptions)
- Disabled
- Default
- Speed
- true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- true
- true
- MultiThreadedDebug
- true
- .\Debug/NetHack.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
-
-
- .\Release/NetHack.pdb
- true
- .\Release/NetHack.map
- Console
- true
- 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)
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/NetHack.bsc
-
-
- Install exe
-
- if NOT exist ..\binary\*.* mkdir ..\binary
- copy $(OutDir)NetHack.exe ..\binary
- copy ..\dat\nhdat ..\binary
- copy ..\dat\license ..\binary
- copy ..\dat\symbols ..\binary
- if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
- if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
- if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
- copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
- if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- GUISTUB;NDEBUG;WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
- GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GUISTUB;%(PreprocessorDefinitions)
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/NetHackW.vcxproj b/win/win32/vs2015/NetHackW.vcxproj
index 15100ba54..51ba95e5b 100755
--- a/win/win32/vs2015/NetHackW.vcxproj
+++ b/win/win32/vs2015/NetHackW.vcxproj
@@ -1,514 +1,188 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{CEC5D360-8804-454F-8591-002184C23499}
NetHackW
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\Release\
- .\Release\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\Debug\
- .\Debug\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\Release/NetHackW.tlb
-
-
-
+
+
+
+
+
- /Gs /Oi- /FS %(AdditionalOptions)
+ /Gs /Oi- %(AdditionalOptions)
Disabled
- OnlyExplicitInline
- Speed
true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;WIN32CONNDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/NetHackW.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
+ $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)
+ TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)
NDEBUG;%(PreprocessorDefinitions)
0x0409
- /MAPINFO:EXPORTS %(AdditionalOptions)
- comctl32.lib;winmm.lib;%(AdditionalDependencies)
- true
- true
- .\Release/NetHackW.pdb
- true
- .\Release/NetHackW.map
+
Windows
- false
-
-
- MachineX86
-
-
- true
- .\Release/NetHackW.bsc
-
-
- Install exe
- copy $(OutDir)NetHackW.exe ..\binary
-copy ..\dat\nhdat ..\binary
-copy ..\dat\license ..\binary
-copy ..\dat\symbols ..\binary
-if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
-if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
-if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
-copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
-if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- .\Release/NetHackW.tlb
-
-
-
-
- /Gs /Oi- /FS %(AdditionalOptions)
- Disabled
- OnlyExplicitInline
- Speed
- true
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;WIN32CONNDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/NetHackW.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- /MAPINFO:EXPORTS %(AdditionalOptions)
comctl32.lib;winmm.lib;%(AdditionalDependencies)
- true
- true
- .\Release/NetHackW.pdb
- true
- .\Release/NetHackW.map
- Windows
- false
-
-
-
- true
- .\Release/NetHackW.bsc
-
-
- Install exe
- copy $(OutDir)NetHackW.exe ..\binary
-copy ..\dat\nhdat ..\binary
-copy ..\dat\license ..\binary
-copy ..\dat\symbols ..\binary
-if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
-if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
-if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
-copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
-if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\Debug/NetHackW.tlb
-
-
-
-
- Disabled
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;WIN32CON_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/NetHackW.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /Gs /Oi- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- comctl32.lib;winmm.lib;%(AdditionalDependencies)
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Windows
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/NetHackW.bsc
-
-
- Install exe
- if NOT exist ..\binary\*.* mkdir ..\binary
-copy $(OutDir)NetHackW.exe ..\binary
-copy ..\dat\nhdat ..\binary
-copy ..\dat\license ..\binary
-copy ..\dat\symbols ..\binary
-if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
-if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
-if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
-copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
-if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- .\Debug/NetHackW.tlb
-
-
-
-
- Disabled
- ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories)
- TILES;MSWIN_GRAPHICS;WIN32CON_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/NetHackW.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- ProgramDatabase
- false
- /Gs /Oi- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- comctl32.lib;winmm.lib;%(AdditionalDependencies)
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Windows
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/NetHackW.bsc
-
-
- Install exe
- if NOT exist ..\binary\*.* mkdir ..\binary
-copy $(OutDir)NetHackW.exe ..\binary
-copy ..\dat\nhdat ..\binary
-copy ..\dat\license ..\binary
-copy ..\dat\symbols ..\binary
-if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf
-if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt
-if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt
-copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh
-if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TTYSTUB; _DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- TTYSTUB;NDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- TTYSTUB; _DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- TTYSTUB;NDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TTYSTUB;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {8a3f81c7-2968-49a8-86bf-2669412ad7de}
- false
-
-
- {0303a585-3f83-4bb7-af6b-1e12c8fb54ac}
- false
-
-
- {9dd9c52e-e8c9-4533-bd22-83c055c0aaba}
- false
-
-
- {ba3dd34c-04b7-40d0-b373-9329aa9e8945}
- false
-
-
- {93f10526-209e-41d7-bbea-775787876895}
- false
-
-
- {55946465-fc65-47b3-bb48-742c7694c0d6}
- false
- false
- false
- true
- false
-
-
- {63f9b82b-f589-4082-abe5-d4f0682050ab}
- false
-
-
-
-
+
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/afterdgncomp.proj b/win/win32/vs2015/afterdgncomp.proj
new file mode 100644
index 000000000..74ed0d96a
--- /dev/null
+++ b/win/win32/vs2015/afterdgncomp.proj
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/afterdlb.proj b/win/win32/vs2015/afterdlb.proj
new file mode 100644
index 000000000..a93c8f720
--- /dev/null
+++ b/win/win32/vs2015/afterdlb.proj
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/afterlevcomp.proj b/win/win32/vs2015/afterlevcomp.proj
new file mode 100644
index 000000000..3b8cd4313
--- /dev/null
+++ b/win/win32/vs2015/afterlevcomp.proj
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/aftermakedefs.proj b/win/win32/vs2015/aftermakedefs.proj
new file mode 100644
index 000000000..4986f8e6c
--- /dev/null
+++ b/win/win32/vs2015/aftermakedefs.proj
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/afternethack.proj b/win/win32/vs2015/afternethack.proj
new file mode 100644
index 000000000..4e03f278f
--- /dev/null
+++ b/win/win32/vs2015/afternethack.proj
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/afterrecover.proj b/win/win32/vs2015/afterrecover.proj
new file mode 100644
index 000000000..0652e7828
--- /dev/null
+++ b/win/win32/vs2015/afterrecover.proj
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/aftertile2bmp.proj b/win/win32/vs2015/aftertile2bmp.proj
new file mode 100644
index 000000000..ab37b2e91
--- /dev/null
+++ b/win/win32/vs2015/aftertile2bmp.proj
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/aftertilemap.proj b/win/win32/vs2015/aftertilemap.proj
new file mode 100644
index 000000000..f2e710ddf
--- /dev/null
+++ b/win/win32/vs2015/aftertilemap.proj
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/afteruudecode.proj b/win/win32/vs2015/afteruudecode.proj
new file mode 100644
index 000000000..f871981e0
--- /dev/null
+++ b/win/win32/vs2015/afteruudecode.proj
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props
new file mode 100644
index 000000000..443ebf05f
--- /dev/null
+++ b/win/win32/vs2015/common.props
@@ -0,0 +1,40 @@
+
+
+
+ true
+
+
+ false
+
+
+
+ Level3
+ WIN32;CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+ false
+ /FS %(AdditionalOptions)
+
+
+ Console
+
+
+
+
+ Disabled
+ _DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ true
+ /SAFESEH:NO %(AdditionalOptions)
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ NDEBUG;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/config.props b/win/win32/vs2015/config.props
new file mode 100644
index 000000000..84ef04da2
--- /dev/null
+++ b/win/win32/vs2015/config.props
@@ -0,0 +1,21 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/console.props b/win/win32/vs2015/console.props
new file mode 100644
index 000000000..8fdca9d9e
--- /dev/null
+++ b/win/win32/vs2015/console.props
@@ -0,0 +1,11 @@
+
+
+
+
+ _CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/default.props b/win/win32/vs2015/default.props
new file mode 100644
index 000000000..688b5d311
--- /dev/null
+++ b/win/win32/vs2015/default.props
@@ -0,0 +1,17 @@
+
+
+
+ Application
+ false
+ MultiByte
+ v140
+
+
+ true
+
+
+ false
+ true
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/default_dll.props b/win/win32/vs2015/default_dll.props
new file mode 100644
index 000000000..94a07f465
--- /dev/null
+++ b/win/win32/vs2015/default_dll.props
@@ -0,0 +1,17 @@
+
+
+
+ DynamicLibrary
+ false
+ MultiByte
+ v140
+
+
+ true
+
+
+ false
+ true
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/dgncomp.vcxproj b/win/win32/vs2015/dgncomp.vcxproj
index 88b06a032..a44735de3 100755
--- a/win/win32/vs2015/dgncomp.vcxproj
+++ b/win/win32/vs2015/dgncomp.vcxproj
@@ -1,399 +1,125 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
-
- .\..\util/dgncomp.tlb
-
-
-
+
+
+
+
+
+
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/dgncomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\..\util/dgncomp.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\..\util/dgncomp.bsc
-
-
- dgncomp
- echo Building dungeon
-echo chdir ..\dat
-chdir ..\dat
-echo ..\util\dgncomp.exe dungeon.pdf
-..\util\dgncomp.exe dungeon.pdf
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/dgncomp.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/dgncomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\..\util/dgncomp.pdb
- Console
- false
-
-
-
-
- true
- .\..\util/dgncomp.bsc
-
-
- dgncomp
- echo Building dungeon
-echo chdir ..\dat
-chdir ..\dat
-echo ..\util\dgncomp.exe dungeon.pdf
-..\util\dgncomp.exe dungeon.pdf
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/dgncomp.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/dgncomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/dgncomp.bsc
-
-
- dgncomp
- echo Building dungeon
-echo chdir ..\dat
-chdir ..\dat
-echo ..\util\dgncomp.exe dungeon.pdf
-..\util\dgncomp.exe dungeon.pdf
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/dgncomp.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/dgncomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/dgncomp.bsc
-
-
- dgncomp
- echo Building dungeon
-echo chdir ..\dat
-chdir ..\dat
-echo ..\util\dgncomp.exe dungeon.pdf
-..\util\dgncomp.exe dungeon.pdf
-echo chdir ..\build
-chdir ..\build
-
-
+
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {b9e02f2c-8851-442b-bf2a-3581802b78d4}
- false
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+ Lex;
+ Yacc;
+ $(BuildDependsOn);
+
+
+
+
+
+
+ NoLex;
+ NoYacc;
+ $(BuildDependsOn);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/dgnstuff.vcxproj b/win/win32/vs2015/dgnstuff.vcxproj
deleted file mode 100755
index 48d33786e..000000000
--- a/win/win32/vs2015/dgnstuff.vcxproj
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {B9E02F2C-8851-442B-BF2A-3581802B78D4}
- MakeFileProj
-
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\dgnstuff___Win32_Debug\
- .\dgnstuff___Win32_Debug\
- .\Debug\
- .\Debug\
- nmake /f "dgnstuff.mak"
- nmake /f "dgnstuff.mak"
- nmake /f "dgnstuff.mak" /a
- nmake /f "dgnstuff.mak" /a
-
-
- ..\util\dgncomp.exe
- ..\util\dgncomp.exe
- $(NMakePreprocessorDefinitions)
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(NMakeForcedUsingAssemblies)
- .\Release\
- .\Release\
- .\Release\
- .\Release\
- nmake /f "dgnstuff.mak"
- nmake /f "dgnstuff.mak"
- nmake /f "dgnstuff.mak" /a
- nmake /f "dgnstuff.mak" /a
-
-
- ..\util\dgncomp.exe
- ..\util\dgncomp.exe
- $(NMakePreprocessorDefinitions)
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(NMakeForcedUsingAssemblies)
-
-
-
-
-
- {ba3dd34c-04b7-40d0-b373-9329aa9e8945}
- false
-
-
-
-
-
-
diff --git a/win/win32/vs2015/dirs.props b/win/win32/vs2015/dirs.props
new file mode 100644
index 000000000..2395f2153
--- /dev/null
+++ b/win/win32/vs2015/dirs.props
@@ -0,0 +1,22 @@
+
+
+
+ $(MSBuildProjectDirectory)\..\..\..\
+ $(RootDir)util\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\
+ $(RootDir)bin\$(Configuration)\$(Platform)\
+ $(RootDir)obj\$(Configuration)\$(Platform)\$(TargetName)\
+ $(RootDir)dat\
+ $(RootDir)doc\
+ $(RootDir)include\
+ $(RootDir)src\
+ $(RootDir)sys\
+ $(RootDir)util\
+ $(RootDir)sys\share\
+ $(RootDir)sys\winnt\
+ $(RootDir)win\share\
+ $(RootDir)win\tty\
+ $(RootDir)win\win32\
+ $(OutDir)
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/dlb.vcxproj b/win/win32/vs2015/dlb.vcxproj
new file mode 100644
index 000000000..06424d447
--- /dev/null
+++ b/win/win32/vs2015/dlb.vcxproj
@@ -0,0 +1,43 @@
+
+
+
+
+
+ {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
+
+
+
+
+
+
+
+
+
+
+
+
+ $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/dlb_main.vcxproj b/win/win32/vs2015/dlb_main.vcxproj
deleted file mode 100755
index a87d8c285..000000000
--- a/win/win32/vs2015/dlb_main.vcxproj
+++ /dev/null
@@ -1,447 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
-
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
-
- .\Release/dlb_main.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/dlb_main.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/dlb_main.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\Release/dlb_main.bsc
-
-
- Packaging via DLB
- echo chdir ..\dat
-chdir ..\dat
-chdir
-echo data >dlb.lst
-echo oracles >>dlb.lst
-if exist options echo options >>dlb.lst
-if exist ttyoptions echo ttyoptions >>dlb.lst
-if exist guioptions echo guioptions >>dlb.lst
-if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp
-if exist porthelp echo porthelp >>dlb.lst
-echo quest.dat >>dlb.lst
-echo rumors >>dlb.lst
-echo engrave >>dlb.lst
-echo epitaph >>dlb.lst
-echo bogusmon >>dlb.lst
-echo tribute >>dlb.lst
-echo help >>dlb.lst
-echo hh >>dlb.lst
-echo cmdhelp >>dlb.lst
-echo history >>dlb.lst
-echo opthelp >>dlb.lst
-echo wizhelp >>dlb.lst
-echo dungeon >>dlb.lst
-echo license >>dlb.lst
-for %%N in (*.lev) do echo %%N >>dlb.lst
-..\util\dlb_main.exe cIf dlb.lst nhdat
-echo chdir ..\build
-chdir ..\build
-echo if NOT exist ..\binary\*.* mkdir ..\binary
-if NOT exist ..\binary\*.* mkdir ..\binary
-
-
-
-
-
- .\Release/dlb_main.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/dlb_main.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/dlb_main.pdb
- Console
- false
-
-
-
-
- true
- .\Release/dlb_main.bsc
-
-
- Packaging via DLB
- echo chdir ..\dat
-chdir ..\dat
-chdir
-echo data >dlb.lst
-echo oracles >>dlb.lst
-if exist options echo options >>dlb.lst
-if exist ttyoptions echo ttyoptions >>dlb.lst
-if exist guioptions echo guioptions >>dlb.lst
-if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp
-if exist porthelp echo porthelp >>dlb.lst
-echo quest.dat >>dlb.lst
-echo rumors >>dlb.lst
-echo engrave >>dlb.lst
-echo epitaph >>dlb.lst
-echo bogusmon >>dlb.lst
-echo tribute >>dlb.lst
-echo help >>dlb.lst
-echo hh >>dlb.lst
-echo cmdhelp >>dlb.lst
-echo history >>dlb.lst
-echo opthelp >>dlb.lst
-echo wizhelp >>dlb.lst
-echo dungeon >>dlb.lst
-echo license >>dlb.lst
-for %%N in (*.lev) do echo %%N >>dlb.lst
-..\util\dlb_main.exe cIf dlb.lst nhdat
-echo chdir ..\build
-chdir ..\build
-echo if NOT exist ..\binary\*.* mkdir ..\binary
-if NOT exist ..\binary\*.* mkdir ..\binary
-
-
-
-
-
- .\Debug/dlb_main.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/dlb_main.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/dlb_main.bsc
-
-
- Packaging via dlb
- echo chdir ..\dat
-chdir ..\dat
-chdir
-echo data >dlb.lst
-echo oracles >>dlb.lst
-if exist options echo options >>dlb.lst
-if exist ttyoptions echo ttyoptions >>dlb.lst
-if exist guioptions echo guioptions >>dlb.lst
-if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp
-if exist porthelp echo porthelp >>dlb.lst
-echo quest.dat >>dlb.lst
-echo rumors >>dlb.lst
-echo engrave >>dlb.lst
-echo epitaph >>dlb.lst
-echo bogusmon >>dlb.lst
-echo tribute >>dlb.lst
-echo help >>dlb.lst
-echo hh >>dlb.lst
-echo cmdhelp >>dlb.lst
-echo history >>dlb.lst
-echo opthelp >>dlb.lst
-echo wizhelp >>dlb.lst
-echo dungeon >>dlb.lst
-echo license >>dlb.lst
-for %%N in (*.lev) do echo %%N >>dlb.lst
-..\util\dlb_main.exe cIf dlb.lst nhdat
-echo chdir ..\build
-chdir ..\build
-echo if NOT exist ..\binary\*.* mkdir ..\binary
-if NOT exist ..\binary\*.* mkdir ..\binary
-
-
-
-
-
- .\Debug/dlb_main.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/dlb_main.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/dlb_main.bsc
-
-
- Packaging via dlb
- echo chdir ..\dat
-chdir ..\dat
-chdir
-echo data >dlb.lst
-echo oracles >>dlb.lst
-if exist options echo options >>dlb.lst
-if exist ttyoptions echo ttyoptions >>dlb.lst
-if exist guioptions echo guioptions >>dlb.lst
-if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp
-if exist porthelp echo porthelp >>dlb.lst
-echo quest.dat >>dlb.lst
-echo rumors >>dlb.lst
-echo engrave >>dlb.lst
-echo epitaph >>dlb.lst
-echo bogusmon >>dlb.lst
-echo tribute >>dlb.lst
-echo help >>dlb.lst
-echo hh >>dlb.lst
-echo cmdhelp >>dlb.lst
-echo history >>dlb.lst
-echo opthelp >>dlb.lst
-echo wizhelp >>dlb.lst
-echo dungeon >>dlb.lst
-echo license >>dlb.lst
-for %%N in (*.lev) do echo %%N >>dlb.lst
-..\util\dlb_main.exe cIf dlb.lst nhdat
-echo chdir ..\build
-chdir ..\build
-echo if NOT exist ..\binary\*.* mkdir ..\binary
-if NOT exist ..\binary\*.* mkdir ..\binary
-
-
-
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
-
-
-
-
-
- {8a3f81c7-2968-49a8-86bf-2669412ad7de}
- false
-
-
- {9dd9c52e-e8c9-4533-bd22-83c055c0aaba}
- false
-
-
- {ba3dd34c-04b7-40d0-b373-9329aa9e8945}
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/win/win32/vs2015/dll.props b/win/win32/vs2015/dll.props
new file mode 100644
index 000000000..3b37e2ede
--- /dev/null
+++ b/win/win32/vs2015/dll.props
@@ -0,0 +1,11 @@
+
+
+
+
+ WIN32CON;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+
+
+ Windows
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/files.props b/win/win32/vs2015/files.props
new file mode 100644
index 000000000..d905edbdd
--- /dev/null
+++ b/win/win32/vs2015/files.props
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/levcomp.vcxproj b/win/win32/vs2015/levcomp.vcxproj
index 48fa929a7..1d01ffa87 100755
--- a/win/win32/vs2015/levcomp.vcxproj
+++ b/win/win32/vs2015/levcomp.vcxproj
@@ -1,581 +1,88 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
-
- .\..\util/levcomp.tlb
-
-
-
+
+
+
+
+
+
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/levcomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\..\util/levcomp.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\..\util/levcomp.bsc
-
-
- levcomp
- echo Building special levels
-echo chdir ..\dat
-chdir ..\dat
-echo arch.des
-..\util\levcomp.exe arch.des
-echo barb.des
-..\util\levcomp.exe barb.des
-echo bigroom.des
-..\util\levcomp.exe bigroom.des
-echo castle.des
-..\util\levcomp.exe castle.des
-echo caveman.des
-..\util\levcomp.exe caveman.des
-echo endgame.des
-..\util\levcomp.exe endgame.des
-echo gehennom.des
-..\util\levcomp.exe gehennom.des
-echo healer.des
-..\util\levcomp.exe healer.des
-echo knight.des
-..\util\levcomp.exe knight.des
-echo knox.des
-..\util\levcomp.exe knox.des
-echo medusa.des
-..\util\levcomp.exe medusa.des
-echo mines.des
-..\util\levcomp.exe mines.des
-echo monk.des
-..\util\levcomp.exe monk.des
-echo oracle.des
-..\util\levcomp.exe oracle.des
-echo priest.des
-..\util\levcomp.exe priest.des
-echo ranger.des
-..\util\levcomp.exe ranger.des
-echo rogue.des
-..\util\levcomp.exe rogue.des
-echo samurai.des
-..\util\levcomp.exe samurai.des
-echo sokoban.des
-..\util\levcomp.exe sokoban.des
-echo tourist.des
-..\util\levcomp.exe tourist.des
-echo tower.des
-..\util\levcomp.exe tower.des
-echo valkyrie.des
-..\util\levcomp.exe valkyrie.des
-echo wizard .des
-..\util\levcomp.exe wizard.des
-echo yendor.des
-..\util\levcomp.exe yendor.des
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/levcomp.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/levcomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\..\util/levcomp.pdb
- Console
- false
-
-
-
-
- true
- .\..\util/levcomp.bsc
-
-
- levcomp
- echo Building special levels
-echo chdir ..\dat
-chdir ..\dat
-echo arch.des
-..\util\levcomp.exe arch.des
-echo barb.des
-..\util\levcomp.exe barb.des
-echo bigroom.des
-..\util\levcomp.exe bigroom.des
-echo castle.des
-..\util\levcomp.exe castle.des
-echo caveman.des
-..\util\levcomp.exe caveman.des
-echo endgame.des
-..\util\levcomp.exe endgame.des
-echo gehennom.des
-..\util\levcomp.exe gehennom.des
-echo healer.des
-..\util\levcomp.exe healer.des
-echo knight.des
-..\util\levcomp.exe knight.des
-echo knox.des
-..\util\levcomp.exe knox.des
-echo medusa.des
-..\util\levcomp.exe medusa.des
-echo mines.des
-..\util\levcomp.exe mines.des
-echo monk.des
-..\util\levcomp.exe monk.des
-echo oracle.des
-..\util\levcomp.exe oracle.des
-echo priest.des
-..\util\levcomp.exe priest.des
-echo ranger.des
-..\util\levcomp.exe ranger.des
-echo rogue.des
-..\util\levcomp.exe rogue.des
-echo samurai.des
-..\util\levcomp.exe samurai.des
-echo sokoban.des
-..\util\levcomp.exe sokoban.des
-echo tourist.des
-..\util\levcomp.exe tourist.des
-echo tower.des
-..\util\levcomp.exe tower.des
-echo valkyrie.des
-..\util\levcomp.exe valkyrie.des
-echo wizard .des
-..\util\levcomp.exe wizard.des
-echo yendor.des
-..\util\levcomp.exe yendor.des
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/levcomp.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/levcomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/levcomp.bsc
-
-
- levcomp
- echo Building special levels
-echo chdir ..\dat
-chdir ..\dat
-echo arch.des
-..\util\levcomp.exe arch.des
-echo barb.des
-..\util\levcomp.exe barb.des
-echo bigroom.des
-..\util\levcomp.exe bigroom.des
-echo castle.des
-..\util\levcomp.exe castle.des
-echo caveman.des
-..\util\levcomp.exe caveman.des
-echo endgame.des
-..\util\levcomp.exe endgame.des
-echo gehennom.des
-..\util\levcomp.exe gehennom.des
-echo healer.des
-..\util\levcomp.exe healer.des
-echo knight.des
-..\util\levcomp.exe knight.des
-echo knox.des
-..\util\levcomp.exe knox.des
-echo medusa.des
-..\util\levcomp.exe medusa.des
-echo mines.des
-..\util\levcomp.exe mines.des
-echo monk.des
-..\util\levcomp.exe monk.des
-echo oracle.des
-..\util\levcomp.exe oracle.des
-echo priest.des
-..\util\levcomp.exe priest.des
-echo ranger.des
-..\util\levcomp.exe ranger.des
-echo rogue.des
-..\util\levcomp.exe rogue.des
-echo samurai.des
-..\util\levcomp.exe samurai.des
-echo sokoban.des
-..\util\levcomp.exe sokoban.des
-echo tourist.des
-..\util\levcomp.exe tourist.des
-echo tower.des
-..\util\levcomp.exe tower.des
-echo valkyrie.des
-..\util\levcomp.exe valkyrie.des
-echo wizard .des
-..\util\levcomp.exe wizard.des
-echo yendor.des
-..\util\levcomp.exe yendor.des
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\..\util/levcomp.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/levcomp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/levcomp.bsc
-
-
- levcomp
- echo Building special levels
-echo chdir ..\dat
-chdir ..\dat
-echo arch.des
-..\util\levcomp.exe arch.des
-echo barb.des
-..\util\levcomp.exe barb.des
-echo bigroom.des
-..\util\levcomp.exe bigroom.des
-echo castle.des
-..\util\levcomp.exe castle.des
-echo caveman.des
-..\util\levcomp.exe caveman.des
-echo endgame.des
-..\util\levcomp.exe endgame.des
-echo gehennom.des
-..\util\levcomp.exe gehennom.des
-echo healer.des
-..\util\levcomp.exe healer.des
-echo knight.des
-..\util\levcomp.exe knight.des
-echo knox.des
-..\util\levcomp.exe knox.des
-echo medusa.des
-..\util\levcomp.exe medusa.des
-echo mines.des
-..\util\levcomp.exe mines.des
-echo monk.des
-..\util\levcomp.exe monk.des
-echo oracle.des
-..\util\levcomp.exe oracle.des
-echo priest.des
-..\util\levcomp.exe priest.des
-echo ranger.des
-..\util\levcomp.exe ranger.des
-echo rogue.des
-..\util\levcomp.exe rogue.des
-echo samurai.des
-..\util\levcomp.exe samurai.des
-echo sokoban.des
-..\util\levcomp.exe sokoban.des
-echo tourist.des
-..\util\levcomp.exe tourist.des
-echo tower.des
-..\util\levcomp.exe tower.des
-echo valkyrie.des
-..\util\levcomp.exe valkyrie.des
-echo wizard .des
-..\util\levcomp.exe wizard.des
-echo yendor.des
-..\util\levcomp.exe yendor.des
-echo chdir ..\build
-chdir ..\build
-
-
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {ff144dfb-83a5-4d26-a598-715a2b354782}
- false
-
+
-
-
+
+
+
+
+ Lex;
+ Yacc;
+ $(BuildDependsOn);
+
+
+
+
+
+
+ NoLex;
+ NoYacc;
+ $(BuildDependsOn);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/levstuff.vcxproj b/win/win32/vs2015/levstuff.vcxproj
deleted file mode 100755
index f7bb276f4..000000000
--- a/win/win32/vs2015/levstuff.vcxproj
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {FF144DFB-83A5-4D26-A598-715A2B354782}
- MakeFileProj
-
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
- Makefile
- false
- v120
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\Release\
- .\Release\
- .\Release\
- .\Release\
- nmake /f "levstuff.mak"
- nmake /f "levstuff.mak"
- nmake /f "levstuff.mak" /a
- nmake /f "levstuff.mak" /a
-
-
- ..\util\lev_lex.c
- ..\util\lev_lex.c
- $(NMakePreprocessorDefinitions)
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(NMakeForcedUsingAssemblies)
- .\levstuff___Win32_Debug0\
- .\levstuff___Win32_Debug0\
- .\levstuff___Win32_Debug0\
- .\levstuff___Win32_Debug0\
- nmake /f "levstuff.mak"
- nmake /f "levstuff.mak"
- nmake /f "levstuff.mak" /a
- nmake /f "levstuff.mak" /a
-
-
- ..\util\lev_lex.c
- ..\util\lev_lex.c
- $(NMakePreprocessorDefinitions)
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(NMakeForcedUsingAssemblies)
-
-
-
-
-
- {ba3dd34c-04b7-40d0-b373-9329aa9e8945}
- false
-
-
-
-
-
-
diff --git a/win/win32/vs2015/makedefs.vcxproj b/win/win32/vs2015/makedefs.vcxproj
index 38ad439ad..cedd41204 100755
--- a/win/win32/vs2015/makedefs.vcxproj
+++ b/win/win32/vs2015/makedefs.vcxproj
@@ -1,464 +1,55 @@
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
+
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
-
-
-
- .\..\util/makedefs.tlb
-
-
-
+
+
+
+
+
+
+
- MaxSpeed
- OnlyExplicitInline
- .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/makedefs.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- .\..\util/makedefs.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\..\util/makedefs.bsc
-
-
- Running makedefs
- echo chdir ..\util
-chdir ..\util
-chdir
-echo makedefs.exe -v
-makedefs.exe -v
-echo makedefs.exe -o
-makedefs.exe -o
-echo makedefs.exe -p
-makedefs.exe -p
-echo makedefs.exe -m
-makedefs.exe -m
-echo makedefs.exe -z
-makedefs.exe -z
-echo chdir ..\dat
-chdir ..\dat
-chdir
-echo Generating NetHack database
-echo ..\util\makedefs.exe -d
-..\util\makedefs.exe -d
-echo Generating rumors
-echo ..\util\makedefs.exe -r
-..\util\makedefs.exe -r
-echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon
-echo ..\util\makedefs.exe -s
-..\util\makedefs.exe -s
-echo Generating quests
-echo ..\util\makedefs.exe -q
-..\util\makedefs.exe -q
-echo Generating oracles
-echo ..\util\makedefs.exe -h
-..\util\makedefs.exe -h
-echo Generating dungeon.pdf
-echo ..\util\makedefs.exe -e
-..\util\makedefs.exe -e
-echo chdir ..\build
-chdir ..\build
-copy ..\win\share\tilemap.c ..\win\share\tiletxt.c
-
-
-
-
-
- .\..\util/makedefs.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/makedefs.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- .\..\util/makedefs.pdb
- Console
- false
-
-
-
-
- true
- .\..\util/makedefs.bsc
-
-
- Running makedefs
- echo chdir ..\util
-chdir ..\util
-chdir
-echo makedefs.exe -v
-makedefs.exe -v
-echo makedefs.exe -o
-makedefs.exe -o
-echo makedefs.exe -p
-makedefs.exe -p
-echo makedefs.exe -m
-makedefs.exe -m
-echo makedefs.exe -z
-makedefs.exe -z
-echo chdir ..\dat
-chdir ..\dat
-chdir
-echo Generating NetHack database
-echo ..\util\makedefs.exe -d
-..\util\makedefs.exe -d
-echo Generating rumors
-echo ..\util\makedefs.exe -r
-..\util\makedefs.exe -r
-echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon
-echo ..\util\makedefs.exe -s
-..\util\makedefs.exe -s
-echo Generating quests
-echo ..\util\makedefs.exe -q
-..\util\makedefs.exe -q
-echo Generating oracles
-echo ..\util\makedefs.exe -h
-..\util\makedefs.exe -h
-echo Generating dungeon.pdf
-echo ..\util\makedefs.exe -e
-..\util\makedefs.exe -e
-echo chdir ..\build
-chdir ..\build
-copy ..\win\share\tilemap.c ..\win\share\tiletxt.c
-
-
-
-
-
- .\..\util/makedefs.tlb
-
-
-
-
- Disabled
- .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/makedefs.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/makedefs.bsc
-
-
- Running makedefs
- echo chdir ..\util
-chdir ..\util
-chdir
-echo makedefs.exe -v
-makedefs.exe -v
-echo makedefs.exe -o
-makedefs.exe -o
-echo makedefs.exe -p
-makedefs.exe -p
-echo makedefs.exe -m
-makedefs.exe -m
-echo makedefs.exe -z
-makedefs.exe -z
-echo chdir ..\dat
-chdir ..\dat
-chdir
-echo Generating NetHack database
-echo ..\util\makedefs.exe -d
-..\util\makedefs.exe -d
-echo Generating rumors
-echo ..\util\makedefs.exe -r
-..\util\makedefs.exe -r
-echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon
-echo ..\util\makedefs.exe -s
-..\util\makedefs.exe -s
-echo Generating quests
-echo ..\util\makedefs.exe -q
-..\util\makedefs.exe -q
-echo Generating oracles
-echo ..\util\makedefs.exe -h
-..\util\makedefs.exe -h
-echo Generating dungeon.pdf
-echo ..\util\makedefs.exe -e
-..\util\makedefs.exe -e
-echo chdir ..\build
-chdir ..\build
-copy ..\win\share\tilemap.c ..\win\share\tiletxt.c
-
-
-
-
-
- .\..\util/makedefs.tlb
-
-
-
-
- Disabled
- .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/makedefs.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\..\util/makedefs.bsc
-
-
- Running makedefs
- echo chdir ..\util
-chdir ..\util
-chdir
-echo makedefs.exe -v
-makedefs.exe -v
-echo makedefs.exe -o
-makedefs.exe -o
-echo makedefs.exe -p
-makedefs.exe -p
-echo makedefs.exe -m
-makedefs.exe -m
-echo makedefs.exe -z
-makedefs.exe -z
-echo chdir ..\dat
-chdir ..\dat
-chdir
-echo Generating NetHack database
-echo ..\util\makedefs.exe -d
-..\util\makedefs.exe -d
-echo Generating rumors
-echo ..\util\makedefs.exe -r
-..\util\makedefs.exe -r
-echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon
-echo ..\util\makedefs.exe -s
-..\util\makedefs.exe -s
-echo Generating quests
-echo ..\util\makedefs.exe -q
-..\util\makedefs.exe -q
-echo Generating oracles
-echo ..\util\makedefs.exe -h
-..\util\makedefs.exe -h
-echo Generating dungeon.pdf
-echo ..\util\makedefs.exe -e
-..\util\makedefs.exe -e
-echo chdir ..\build
-chdir ..\build
-copy ..\win\share\tilemap.c ..\win\share\tiletxt.c
-
-
+
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/nhdefkey.def b/win/win32/vs2015/nhdefkey.def
new file mode 100644
index 000000000..2950904e4
--- /dev/null
+++ b/win/win32/vs2015/nhdefkey.def
@@ -0,0 +1,8 @@
+LIBRARY nhdefkey
+EXPORTS
+ProcessKeystroke
+NHkbhit
+CheckInput
+SourceWhere
+SourceAuthor
+KeyHandlerName
diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj
index ff353a055..31fd7d7cc 100755
--- a/win/win32/vs2015/nhdefkey.vcxproj
+++ b/win/win32/vs2015/nhdefkey.vcxproj
@@ -1,197 +1,39 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{6813477F-64B6-4B97-B230-438D0D233385}
Win32Proj
nhdefkey
+
-
- DynamicLibrary
- true
- v140
- NotSet
-
-
- DynamicLibrary
- true
- v140
- NotSet
-
-
- DynamicLibrary
- false
- v140
- true
- NotSet
-
-
- DynamicLibrary
- false
- v140
- true
- NotSet
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
-
+
+
+
+
+
+
-
-
- Level3
- Disabled
- WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)
- $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories)
- false
+ NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)
+ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)
- Windows
- true
- $(ProjectDir)..\build\nhdefkey.def
- true
- true
+ nhdefkey.def
-
- copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary
-
-
-
-
-
-
-
-
-
-
- Level3
- Disabled
- WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)
- $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories)
- false
-
-
- Windows
- true
- $(ProjectDir)..\build\nhdefkey64.def
-
-
- copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary
-
-
-
-
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)
- $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories)
- false
-
-
- Windows
- true
- true
- true
- $(ProjectDir)..\build\nhdefkey.def
- true
- true
-
-
- copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary
-
-
-
-
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions)
- $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories)
- false
-
-
- Windows
- true
- true
- true
- $(ProjectDir)..\build\nhdefkey64.def
-
-
- copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
+
-
-
\ No newline at end of file
diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt
new file mode 100644
index 000000000..d0aaf24e1
--- /dev/null
+++ b/win/win32/vs2015/notes.txt
@@ -0,0 +1,7 @@
+Changes made to vs2015 build
+
+1. allow solution to be used in place
+
+To Do
+
+1. win\share\tiletxt.c is copied from win\share\tilemap.c ... use tilemap.c instead directly.
diff --git a/win/win32/vs2015/recover.vcxproj b/win/win32/vs2015/recover.vcxproj
index a5ab56e0b..5b4626ca4 100755
--- a/win/win32/vs2015/recover.vcxproj
+++ b/win/win32/vs2015/recover.vcxproj
@@ -1,306 +1,46 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
-
-
-
- .\Debug/recover.tlb
-
-
-
+
+
+
+
+
+
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/recover.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/recover.bsc
-
-
- install exe
- copy $(OutDir)recover.exe ..\binary
-if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt
-
-
-
-
-
- .\Debug/recover.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/recover.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/recover.bsc
-
-
- install exe
- copy $(OutDir)recover.exe ..\binary
-if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt
-
-
-
-
-
- .\Release/recover.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/recover.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/recover.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\Release/recover.bsc
-
-
- copy $(OutDir)recover.exe ..\binary
-if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt
-
-
-
-
-
- .\Release/recover.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/recover.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/recover.pdb
- Console
- false
-
-
-
-
- true
- .\Release/recover.bsc
-
-
- copy $(OutDir)recover.exe ..\binary
-if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt
-
-
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
-
-
-
-
-
-
-
-
-
-
-
- {0303a585-3f83-4bb7-af6b-1e12c8fb54ac}
- false
-
-
- {ba3dd34c-04b7-40d0-b373-9329aa9e8945}
- false
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/tile2bmp.vcxproj b/win/win32/vs2015/tile2bmp.vcxproj
index e4b2bd881..9b72b98f1 100755
--- a/win/win32/vs2015/tile2bmp.vcxproj
+++ b/win/win32/vs2015/tile2bmp.vcxproj
@@ -1,324 +1,47 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{642BC75D-ABAF-403E-8224-7C725FD4CB42}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
-
-
-
- .\Debug/tile2bmp.tlb
-
-
-
+
+
+
+
+
+
- Disabled
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/tile2bmp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- ProgramDatabase
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/tile2bmp.bsc
-
-
-
-
- .\Debug/tile2bmp.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/tile2bmp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- ProgramDatabase
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/tile2bmp.bsc
-
-
-
-
- .\Release/tile2bmp.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/tile2bmp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/tile2bmp.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\Release/tile2bmp.bsc
-
-
-
-
- .\Release/tile2bmp.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/tile2bmp.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/tile2bmp.pdb
- Console
- false
-
-
-
-
- true
- .\Release/tile2bmp.bsc
-
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- PACKED_FILE;%(PreprocessorDefinitions)
- PACKED_FILE;%(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- TILETEXT;%(PreprocessorDefinitions)
- TILETEXT;%(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- TILETEXT;%(PreprocessorDefinitions)
- TILETEXT;%(PreprocessorDefinitions)
-
+
+
+
+
+
+
+
+ TILETEXT;%(PreprocessorDefinitions)
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/tilemap.vcxproj b/win/win32/vs2015/tilemap.vcxproj
index 6057b2bac..a970b2aa6 100755
--- a/win/win32/vs2015/tilemap.vcxproj
+++ b/win/win32/vs2015/tilemap.vcxproj
@@ -1,345 +1,81 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{93F10526-209E-41D7-BBEA-775787876895}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
-
-
-
- .\Debug/tilemap.tlb
-
-
-
+
+
+
+
+
+
- Disabled
- ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/tilemap.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
+ $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)
+ WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/tilemap.bsc
-
-
- Generating src\tile.c
- echo chdir ..\src
-chdir ..\src
-..\util\tilemap.exe
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\Debug/tilemap.tlb
-
-
-
-
- Disabled
- ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories)
- _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/tilemap.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/tilemap.bsc
-
-
- Generating src\tile.c
- echo chdir ..\src
-chdir ..\src
-..\util\tilemap.exe
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\Release/tilemap.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/tilemap.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/tilemap.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\Release/tilemap.bsc
-
-
- Generating src\tile.c
- echo chdir ..\src
-chdir ..\src
-..\util\tilemap.exe
-echo chdir ..\build
-chdir ..\build
-
-
-
-
-
- .\Release/tilemap.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories)
- NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/tilemap.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x1009
-
-
- true
- .\Release/tilemap.pdb
- Console
- false
-
-
-
-
- true
- .\Release/tilemap.bsc
-
-
- Generating src\tile.c
- echo chdir ..\src
-chdir ..\src
-..\util\tilemap.exe
-echo chdir ..\build
-chdir ..\build
-
-
+
-
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win/win32/vs2015/uudecode.vcxproj b/win/win32/vs2015/uudecode.vcxproj
index 4ca0b12d5..d37115eed 100755
--- a/win/win32/vs2015/uudecode.vcxproj
+++ b/win/win32/vs2015/uudecode.vcxproj
@@ -1,352 +1,29 @@
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{63F9B82B-F589-4082-ABE5-D4F0682050AB}
+
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- .\..\util\
- .\..\util\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- false
- false
- .\Debug\$(ProjectName)\
- .\Debug\$(ProjectName)\
- true
- true
- .\..\util\
- .\..\util\
-
-
-
- .\Release/uudecode.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/uudecode.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- .\Release/uudecode.pdb
- Console
- false
-
-
- MachineX86
-
-
- true
- .\Release/uudecode.bsc
-
-
- echo chdir ..\win\win32
-chdir ..\win\win32
-echo decoding icon (nhico.uu to NetHack.ico)
-..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
-echo decoding mnsel (mnsel.uu to mnsel.bmp)
-..\..\util\uudecode.exe mnsel.uu
-echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp)
-..\..\util\uudecode.exe mnselcnt.uu
-echo decoding mnunsel (mnunsel.uu to mnunsel.bmp)
-..\..\util\uudecode.exe mnunsel.uu
-echo decoding petmark (petmark.uu to petmark.bmp)
-..\..\util\uudecode.exe petmark.uu
-echo decoding pilemark (pilemark.uu to pilemark.bmp)
-..\..\util\uudecode.exe pilemark.uu
-echo decoding splash (splash.uu to splash.bmp)
-..\..\util\uudecode.exe splash.uu
-echo decoding tombstone (rip.uu to rip.bmp)
-..\..\util\uudecode.exe rip.uu
-echo decoding record (record.uu to record.)
-..\..\util\uudecode.exe record.uu
-chdir ..\..\binary
-
-
-
-
-
- .\Release/uudecode.tlb
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
- .\Release/uudecode.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- false
- /FS %(AdditionalOptions)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- .\Release/uudecode.pdb
- Console
- false
-
-
-
-
- true
- .\Release/uudecode.bsc
-
-
- echo chdir ..\win\win32
-chdir ..\win\win32
-echo decoding icon (nhico.uu to NetHack.ico)
-..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
-echo decoding mnsel (mnsel.uu to mnsel.bmp)
-..\..\util\uudecode.exe mnsel.uu
-echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp)
-..\..\util\uudecode.exe mnselcnt.uu
-echo decoding mnunsel (mnunsel.uu to mnunsel.bmp)
-..\..\util\uudecode.exe mnunsel.uu
-echo decoding petmark (petmark.uu to petmark.bmp)
-..\..\util\uudecode.exe petmark.uu
-echo decoding pilemark (pilemark.uu to pilemark.bmp)
-..\..\util\uudecode.exe pilemark.uu
-echo decoding splash (splash.uu to splash.bmp)
-..\..\util\uudecode.exe splash.uu
-echo decoding tombstone (rip.uu to rip.bmp)
-..\..\util\uudecode.exe rip.uu
-echo decoding record (record.uu to record.)
-..\..\util\uudecode.exe record.uu
-chdir ..\..\binary
-
-
-
-
-
- .\Debug/uudecode.tlb
-
-
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/uudecode.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- MachineX86
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/uudecode.bsc
-
-
- echo chdir ..\win\win32
-chdir ..\win\win32
-echo decoding icon (nhico.uu to NetHack.ico)
-..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
-echo decoding mnsel (mnsel.uu to mnsel.bmp)
-..\..\util\uudecode.exe mnsel.uu
-echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp)
-..\..\util\uudecode.exe mnselcnt.uu
-echo decoding mnunsel (mnunsel.uu to mnunsel.bmp)
-..\..\util\uudecode.exe mnunsel.uu
-echo decoding petmark (petmark.uu to petmark.bmp)
-..\..\util\uudecode.exe petmark.uu
-echo decoding pilemark (pilemark.uu to pilemark.bmp)
-..\..\util\uudecode.exe pilemark.uu
-echo decoding splash (splash.uu to splash.bmp)
-..\..\util\uudecode.exe splash.uu
-echo decoding tombstone (rip.uu to rip.bmp)
-..\..\util\uudecode.exe rip.uu
-echo decoding record (record.uu to record.)
-..\..\util\uudecode.exe record.uu
-chdir ..\..\binary
-
-
-
-
-
- .\Debug/uudecode.tlb
-
-
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebug
- .\Debug/uudecode.pch
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- .\$(ConfigurationName)\$(ProjectName)\
- Level3
- true
- EditAndContinue
- false
- /FS %(AdditionalOptions)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
- true
- .\$(ConfigurationName)\$(ProjectName)\
- Console
- false
-
-
- /SAFESEH:NO %(AdditionalOptions)
-
-
- true
- .\Debug/uudecode.bsc
-
-
- echo chdir ..\win\win32
-chdir ..\win\win32
-echo decoding icon (nhico.uu to NetHack.ico)
-..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
-echo decoding mnsel (mnsel.uu to mnsel.bmp)
-..\..\util\uudecode.exe mnsel.uu
-echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp)
-..\..\util\uudecode.exe mnselcnt.uu
-echo decoding mnunsel (mnunsel.uu to mnunsel.bmp)
-..\..\util\uudecode.exe mnunsel.uu
-echo decoding petmark (petmark.uu to petmark.bmp)
-..\..\util\uudecode.exe petmark.uu
-echo decoding pilemark (pilemark.uu to pilemark.bmp)
-..\..\util\uudecode.exe pilemark.uu
-echo decoding splash (splash.uu to splash.bmp)
-..\..\util\uudecode.exe splash.uu
-echo decoding tombstone (rip.uu to rip.bmp)
-..\..\util\uudecode.exe rip.uu
-echo decoding record (record.uu to record.)
-..\..\util\uudecode.exe record.uu
-chdir ..\..\binary
-
-
-
+
+
+
+
-
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
- %(PreprocessorDefinitions)
-
+
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file