Disable warning for LUA files in Visual Studio builds.

diff --git a/win/win32/vs/NetHack.vcxproj b/win/win32/vs/NetHack.vcxproj
index 211181e933409fea4644ee783e974f3e44330b41..02240e2c08a6402d7354ab00edae3126e7efcfc1 100644 (file)
--- a/win/win32/vs/NetHack.vcxproj
+++ b/win/win32/vs/NetHack.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <Import Project="config.props" />\r
   <PropertyGroup Label="Globals">\r
@@ -9,18 +9,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
+  <Import Project="NetHackProperties.props" />\r
   <Import Project="console.props" />\r
   <Import Project="common.props" />\r
   <Import Project="dirs.props" />\r
@@ -53,42 +42,9 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(LuaDir)lapi.c" />\r
-    <ClCompile Include="$(LuaDir)lauxlib.c" />\r
-    <ClCompile Include="$(LuaDir)lbaselib.c" />\r
-    <ClCompile Include="$(LuaDir)lbitlib.c">\r
-        <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.4'">true</ExcludedFromBuild>\r
-        <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.3'">false</ExcludedFromBuild>\r
+    <ClCompile Include="@(Lua)">\r
+      <DisableSpecificWarnings>4701;4702;4244;4310</DisableSpecificWarnings>\r
     </ClCompile>\r
-    <ClCompile Include="$(LuaDir)lcode.c" />\r
-    <ClCompile Include="$(LuaDir)lcorolib.c" />\r
-    <ClCompile Include="$(LuaDir)lctype.c" />\r
-    <ClCompile Include="$(LuaDir)ldblib.c" />\r
-    <ClCompile Include="$(LuaDir)ldebug.c" />\r
-    <ClCompile Include="$(LuaDir)ldo.c" />\r
-    <ClCompile Include="$(LuaDir)ldump.c" />\r
-    <ClCompile Include="$(LuaDir)lfunc.c" />\r
-    <ClCompile Include="$(LuaDir)lgc.c" />\r
-    <ClCompile Include="$(LuaDir)linit.c" />\r
-    <ClCompile Include="$(LuaDir)liolib.c" />\r
-    <ClCompile Include="$(LuaDir)llex.c" />\r
-    <ClCompile Include="$(LuaDir)lmathlib.c" />\r
-    <ClCompile Include="$(LuaDir)lmem.c" />\r
-    <ClCompile Include="$(LuaDir)loadlib.c" />\r
-    <ClCompile Include="$(LuaDir)lobject.c" />\r
-    <ClCompile Include="$(LuaDir)lopcodes.c" />\r
-    <ClCompile Include="$(LuaDir)loslib.c" />\r
-    <ClCompile Include="$(LuaDir)lparser.c" />\r
-    <ClCompile Include="$(LuaDir)lstate.c" />\r
-    <ClCompile Include="$(LuaDir)lstring.c" />\r
-    <ClCompile Include="$(LuaDir)lstrlib.c" />\r
-    <ClCompile Include="$(LuaDir)ltable.c" />\r
-    <ClCompile Include="$(LuaDir)ltablib.c" />\r
-    <ClCompile Include="$(LuaDir)ltm.c" />\r
-    <ClCompile Include="$(LuaDir)lundump.c" />\r
-    <ClCompile Include="$(LuaDir)lutf8lib.c" />\r
-    <ClCompile Include="$(LuaDir)lvm.c" />\r
-    <ClCompile Include="$(LuaDir)lzio.c" />\r
     <ClCompile Include="$(SrcDir)allmain.c" />\r
     <ClCompile Include="$(SrcDir)alloc.c" />\r
     <ClCompile Include="$(SrcDir)apply.c" />\r

diff --git a/win/win32/vs/NetHackProperties.props b/win/win32/vs/NetHackProperties.props
index 25f634a7bc6a1afa33ddb983ebab8d9973e9b8c5..0d595c4f22938e235b764e2680655a5b48774b6a 100644 (file)
--- 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 cd8f67d1a2838264fdd8ce613c00b2bb94cc03e5..0791957cd210fc3095b52c53cc4083d0d969e91f 100644 (file)
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/win/win32/vs/NetHackW.vcxproj
@@ -8,18 +8,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
+  <Import Project="NetHackProperties.props" />\r
   <Import Project="common.props" />\r
   <Import Project="dirs.props" />\r
   <Import Project="files.props" />\r
@@ -47,42 +36,9 @@
     </Manifest>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="$(LuaDir)lapi.c" />\r
-    <ClCompile Include="$(LuaDir)lauxlib.c" />\r
-    <ClCompile Include="$(LuaDir)lbaselib.c" />\r
-    <ClCompile Include="$(LuaDir)lbitlib.c">\r
-      <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.4'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(LUA_VERSION.Substring(0,3))'=='5.3'">false</ExcludedFromBuild>\r
+    <ClCompile Include="@(Lua)">\r
+      <DisableSpecificWarnings>4701;4702;4244;4310</DisableSpecificWarnings>\r
     </ClCompile>\r
-    <ClCompile Include="$(LuaDir)lcode.c" />\r
-    <ClCompile Include="$(LuaDir)lcorolib.c" />\r
-    <ClCompile Include="$(LuaDir)lctype.c" />\r
-    <ClCompile Include="$(LuaDir)ldblib.c" />\r
-    <ClCompile Include="$(LuaDir)ldebug.c" />\r
-    <ClCompile Include="$(LuaDir)ldo.c" />\r
-    <ClCompile Include="$(LuaDir)ldump.c" />\r
-    <ClCompile Include="$(LuaDir)lfunc.c" />\r
-    <ClCompile Include="$(LuaDir)lgc.c" />\r
-    <ClCompile Include="$(LuaDir)linit.c" />\r
-    <ClCompile Include="$(LuaDir)liolib.c" />\r
-    <ClCompile Include="$(LuaDir)llex.c" />\r
-    <ClCompile Include="$(LuaDir)lmathlib.c" />\r
-    <ClCompile Include="$(LuaDir)lmem.c" />\r
-    <ClCompile Include="$(LuaDir)loadlib.c" />\r
-    <ClCompile Include="$(LuaDir)lobject.c" />\r
-    <ClCompile Include="$(LuaDir)lopcodes.c" />\r
-    <ClCompile Include="$(LuaDir)loslib.c" />\r
-    <ClCompile Include="$(LuaDir)lparser.c" />\r
-    <ClCompile Include="$(LuaDir)lstate.c" />\r
-    <ClCompile Include="$(LuaDir)lstring.c" />\r
-    <ClCompile Include="$(LuaDir)lstrlib.c" />\r
-    <ClCompile Include="$(LuaDir)ltable.c" />\r
-    <ClCompile Include="$(LuaDir)ltablib.c" />\r
-    <ClCompile Include="$(LuaDir)ltm.c" />\r
-    <ClCompile Include="$(LuaDir)lundump.c" />\r
-    <ClCompile Include="$(LuaDir)lutf8lib.c" />\r
-    <ClCompile Include="$(LuaDir)lvm.c" />\r
-    <ClCompile Include="$(LuaDir)lzio.c" />\r
     <ClCompile Include="$(SrcDir)allmain.c" />\r
     <ClCompile Include="$(SrcDir)alloc.c" />\r
     <ClCompile Include="$(SrcDir)apply.c" />\r

diff --git a/win/win32/vs/files.props b/win/win32/vs/files.props
index 5aeae719e1d0bf2f8c30d6edd3ce3e24193cef88..5d955fe66d6538eeecb1a64a83bd6a537c9b87f4 100644 (file)
--- 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 d7f5930658c74ad74f7fb50150d2c2a9d0e6a6c8..27828e5ecb323fae43939ffc2220aeb4e99972bc 100644 (file)
--- a/win/win32/vs/recover.vcxproj
+++ b/win/win32/vs/recover.vcxproj
@@ -7,18 +7,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="default.props" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Import Project="NetHackProperties.props" />\r
-  </ImportGroup>\r
+  <Import Project="NetHackProperties.props" />\r
   <Import Project="console.props" />\r
   <Import Project="common.props" />\r
   <Import Project="dirs.props" />\r