Fix Windows build break caused by bump to lua 5.4.2.

Modified Windows build to use submodules/lua for lua source.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..c08764d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/lua"]
+       path = submodules/lua
+       url = https://github.com/lua/lua.git

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 30324cf9bf07f76947baaca7976dfdd02e2d966e..2c6eda1c5767689497fb511503fea29f32a7c0f5 100644 (file)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ resources:
 
 steps:
 - checkout: git://NetHack/NetHack@NetHack-3.7  # $(Agent.BuildDirectory)\s\NetHack
-- checkout: luarepo  # $(Agent.BuildDirectory)\s\lua
+  submodules: true
 
 - task: DownloadSecureFile@1
   name: storeKey

diff --git a/submodules/lua b/submodules/lua
new file mode 160000 (submodule)
index 0000000..e2ea3b3
--- /dev/null
+++ b/submodules/lua
@@ -0,0 +1 @@
+Subproject commit e2ea3b31c94bb3e1da27c233661cb2a16699c685

diff --git a/win/win32/vs/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj
index 61026d3a06ad6feb31b4ab3bb827fc9106ad12be..e9b5d7dd5c610f1f35bfc03615215a5e57d73693 100644 (file)
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/win/win32/vs/NetHackW.vcxproj
@@ -53,6 +53,7 @@
     <ClCompile Include="$(LuaDir)lbitlib.c">\r
       <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.2'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>\r
     </ClCompile>\r
     <ClCompile Include="$(LuaDir)lcode.c" />\r

diff --git a/win/win32/vs/dirs.props b/win/win32/vs/dirs.props
index 05b6543ac9f3c5a76b7afb625e3444856f6266bc..ed8a7554fa7224412dade620be3dfa622be50b07 100644 (file)
--- a/win/win32/vs/dirs.props
+++ b/win/win32/vs/dirs.props
@@ -10,7 +10,7 @@
     <DatDir>$(RootDir)dat\</DatDir>
     <DocDir>$(RootDir)doc\</DocDir>
     <IncDir>$(RootDir)include\</IncDir>
-    <LuaDir>$(RootDir)lib\lua-$(LUA_VERSION)\src\</LuaDir>
+    <LuaDir>$(RootDir)submodules\lua\</LuaDir>
     <SrcDir>$(RootDir)src\</SrcDir>
        <SysDir>$(RootDir)sys\</SysDir>
     <UtilDir>$(RootDir)util\</UtilDir>

diff --git a/win/win32/vs/makedefs.vcxproj b/win/win32/vs/makedefs.vcxproj
index 190952a6a957dc2a23f786fe435ed88ebfd39ad0..f82bb2c9a228236acccf1c44773d318dc9ae4e59 100644 (file)
--- a/win/win32/vs/makedefs.vcxproj
+++ b/win/win32/vs/makedefs.vcxproj
@@ -55,10 +55,10 @@
       Outputs="$(IncDir)\nhlua.h">\r
       <Message Text="Generating $(IncDir)nhlua.h" />\r
        <Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22../submodules/lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
        <Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22../submodules/lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
+       <Exec Command="echo #include %22../submodules/lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
        <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
  </Target>\r
   <Target Name="AfterBuild">\r