From 9862e19a361cb48a236c99aeee402dd1d7f926b9 Mon Sep 17 00:00:00 2001
From: Bart House <bart@barthouse.com>
Date: Fri, 29 Jan 2021 20:49:37 -0800
Subject: [PATCH] Disable warning for LUA files in Visual Studio builds.

---
 win/win32/vs/NetHack.vcxproj         | 52 +++-------------------------
 win/win32/vs/NetHackProperties.props |  5 ++-
 win/win32/vs/NetHackW.vcxproj        | 50 ++------------------------
 win/win32/vs/files.props             | 37 +++++++++++++++++++-
 win/win32/vs/recover.vcxproj         | 13 +------
 5 files changed, 48 insertions(+), 109 deletions(-)

diff --git a/win/win32/vs/NetHack.vcxproj b/win/win32/vs/NetHack.vcxproj
index 211181e93..02240e2c0 100644
--- a/win/win32/vs/NetHack.vcxproj
+++ b/win/win32/vs/NetHack.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
@@ -9,18 +9,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
+  <Import Project="NetHackProperties.props" />
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />
@@ -53,42 +42,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(LuaDir)lapi.c" />
-    <ClCompile Include="$(LuaDir)lauxlib.c" />
-    <ClCompile Include="$(LuaDir)lbaselib.c" />
-    <ClCompile Include="$(LuaDir)lbitlib.c">
-        <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.4'">true</ExcludedFromBuild>
-        <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.3'">false</ExcludedFromBuild>
+    <ClCompile Include="@(Lua)">
+      <DisableSpecificWarnings>4701;4702;4244;4310</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="$(LuaDir)lcode.c" />
-    <ClCompile Include="$(LuaDir)lcorolib.c" />
-    <ClCompile Include="$(LuaDir)lctype.c" />
-    <ClCompile Include="$(LuaDir)ldblib.c" />
-    <ClCompile Include="$(LuaDir)ldebug.c" />
-    <ClCompile Include="$(LuaDir)ldo.c" />
-    <ClCompile Include="$(LuaDir)ldump.c" />
-    <ClCompile Include="$(LuaDir)lfunc.c" />
-    <ClCompile Include="$(LuaDir)lgc.c" />
-    <ClCompile Include="$(LuaDir)linit.c" />
-    <ClCompile Include="$(LuaDir)liolib.c" />
-    <ClCompile Include="$(LuaDir)llex.c" />
-    <ClCompile Include="$(LuaDir)lmathlib.c" />
-    <ClCompile Include="$(LuaDir)lmem.c" />
-    <ClCompile Include="$(LuaDir)loadlib.c" />
-    <ClCompile Include="$(LuaDir)lobject.c" />
-    <ClCompile Include="$(LuaDir)lopcodes.c" />
-    <ClCompile Include="$(LuaDir)loslib.c" />
-    <ClCompile Include="$(LuaDir)lparser.c" />
-    <ClCompile Include="$(LuaDir)lstate.c" />
-    <ClCompile Include="$(LuaDir)lstring.c" />
-    <ClCompile Include="$(LuaDir)lstrlib.c" />
-    <ClCompile Include="$(LuaDir)ltable.c" />
-    <ClCompile Include="$(LuaDir)ltablib.c" />
-    <ClCompile Include="$(LuaDir)ltm.c" />
-    <ClCompile Include="$(LuaDir)lundump.c" />
-    <ClCompile Include="$(LuaDir)lutf8lib.c" />
-    <ClCompile Include="$(LuaDir)lvm.c" />
-    <ClCompile Include="$(LuaDir)lzio.c" />
     <ClCompile Include="$(SrcDir)allmain.c" />
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)apply.c" />
diff --git a/win/win32/vs/NetHackProperties.props b/win/win32/vs/NetHackProperties.props
index 25f634a7b..0d595c4f2 100644
--- a/win/win32/vs/NetHackProperties.props
+++ b/win/win32/vs/NetHackProperties.props
@@ -5,7 +5,10 @@
     <VERSION_MAJOR>3</VERSION_MAJOR>
     <VERSION_MINOR>7</VERSION_MINOR>
     <PATCHLEVEL>0</PATCHLEVEL>
-    <LUA_VERSION>5.4.2</LUA_VERSION>
+	<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
+	<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
+	<LUA_PATCH_LEVEL>2></LUA_PATCH_LEVEL>
+    <LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
     <ADD_PACKAGE>true</ADD_PACKAGE>
   </PropertyGroup>
   <PropertyGroup />
diff --git a/win/win32/vs/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj
index cd8f67d1a..0791957cd 100644
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/win/win32/vs/NetHackW.vcxproj
@@ -8,18 +8,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
+  <Import Project="NetHackProperties.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
@@ -47,42 +36,9 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(LuaDir)lapi.c" />
-    <ClCompile Include="$(LuaDir)lauxlib.c" />
-    <ClCompile Include="$(LuaDir)lbaselib.c" />
-    <ClCompile Include="$(LuaDir)lbitlib.c">
-      <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.4'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.3'">false</ExcludedFromBuild>
+    <ClCompile Include="@(Lua)">
+      <DisableSpecificWarnings>4701;4702;4244;4310</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="$(LuaDir)lcode.c" />
-    <ClCompile Include="$(LuaDir)lcorolib.c" />
-    <ClCompile Include="$(LuaDir)lctype.c" />
-    <ClCompile Include="$(LuaDir)ldblib.c" />
-    <ClCompile Include="$(LuaDir)ldebug.c" />
-    <ClCompile Include="$(LuaDir)ldo.c" />
-    <ClCompile Include="$(LuaDir)ldump.c" />
-    <ClCompile Include="$(LuaDir)lfunc.c" />
-    <ClCompile Include="$(LuaDir)lgc.c" />
-    <ClCompile Include="$(LuaDir)linit.c" />
-    <ClCompile Include="$(LuaDir)liolib.c" />
-    <ClCompile Include="$(LuaDir)llex.c" />
-    <ClCompile Include="$(LuaDir)lmathlib.c" />
-    <ClCompile Include="$(LuaDir)lmem.c" />
-    <ClCompile Include="$(LuaDir)loadlib.c" />
-    <ClCompile Include="$(LuaDir)lobject.c" />
-    <ClCompile Include="$(LuaDir)lopcodes.c" />
-    <ClCompile Include="$(LuaDir)loslib.c" />
-    <ClCompile Include="$(LuaDir)lparser.c" />
-    <ClCompile Include="$(LuaDir)lstate.c" />
-    <ClCompile Include="$(LuaDir)lstring.c" />
-    <ClCompile Include="$(LuaDir)lstrlib.c" />
-    <ClCompile Include="$(LuaDir)ltable.c" />
-    <ClCompile Include="$(LuaDir)ltablib.c" />
-    <ClCompile Include="$(LuaDir)ltm.c" />
-    <ClCompile Include="$(LuaDir)lundump.c" />
-    <ClCompile Include="$(LuaDir)lutf8lib.c" />
-    <ClCompile Include="$(LuaDir)lvm.c" />
-    <ClCompile Include="$(LuaDir)lzio.c" />
     <ClCompile Include="$(SrcDir)allmain.c" />
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)apply.c" />
diff --git a/win/win32/vs/files.props b/win/win32/vs/files.props
index 5aeae719e..5d955fe66 100644
--- a/win/win32/vs/files.props
+++ b/win/win32/vs/files.props
@@ -188,4 +188,39 @@
     <DlbList Include = "$(DatDir)license"/>
     <DlbList Include = "$(DatDir)*.lua"/>
   </ItemGroup>
- </Project>
+  <ItemGroup>
+    <Lua Include="$(LuaDir)lapi.c"/>
+    <Lua Include="$(LuaDir)lauxlib.c" />
+    <Lua Include="$(LuaDir)lbaselib.c" />
+    <Lua Include="$(LuaDir)lbitlib.c" Condition="'$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION)'=='5.3'" />
+    <Lua Include="$(LuaDir)lcode.c" />
+    <Lua Include="$(LuaDir)lcorolib.c" />
+    <Lua Include="$(LuaDir)lctype.c" />
+    <Lua Include="$(LuaDir)ldblib.c" />
+    <Lua Include="$(LuaDir)ldebug.c" />
+    <Lua Include="$(LuaDir)ldo.c" />
+    <Lua Include="$(LuaDir)ldump.c" />
+    <Lua Include="$(LuaDir)lfunc.c" />
+    <Lua Include="$(LuaDir)lgc.c" />
+    <Lua Include="$(LuaDir)linit.c" />
+    <Lua Include="$(LuaDir)liolib.c" />
+    <Lua Include="$(LuaDir)llex.c" />
+    <Lua Include="$(LuaDir)lmathlib.c" />
+    <Lua Include="$(LuaDir)lmem.c" />
+    <Lua Include="$(LuaDir)loadlib.c" />
+    <Lua Include="$(LuaDir)lobject.c" />
+    <Lua Include="$(LuaDir)lopcodes.c" />
+    <Lua Include="$(LuaDir)loslib.c" />
+    <Lua Include="$(LuaDir)lparser.c" />
+    <Lua Include="$(LuaDir)lstate.c" />
+    <Lua Include="$(LuaDir)lstring.c" />
+    <Lua Include="$(LuaDir)lstrlib.c" />
+    <Lua Include="$(LuaDir)ltable.c" />
+    <Lua Include="$(LuaDir)ltablib.c" />
+    <Lua Include="$(LuaDir)ltm.c" />
+    <Lua Include="$(LuaDir)lundump.c" />
+    <Lua Include="$(LuaDir)lutf8lib.c" />
+    <Lua Include="$(LuaDir)lvm.c" />
+    <Lua Include="$(LuaDir)lzio.c" />
+  </ItemGroup>
+</Project>
diff --git a/win/win32/vs/recover.vcxproj b/win/win32/vs/recover.vcxproj
index d7f593065..27828e5ec 100644
--- a/win/win32/vs/recover.vcxproj
+++ b/win/win32/vs/recover.vcxproj
@@ -7,18 +7,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
+  <Import Project="NetHackProperties.props" />
   <Import Project="console.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />
-- 
2.50.1