nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix Windows build break caused by bump to lua 5.4.2.

Browse Source 
Modified Windows build to use submodules/lua for lua source.
This commit is contained in:
Bart House
2020-12-11 18:45:44 -08:00
parent 5b709fcb55
commit fe874db0b3
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "submodules/lua"]
path = submodules/lua
url = https://github.com/lua/lua.git

2
azure-pipelines.yml
View File

@@ -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

1
submodules/lua Submodule

Submodule submodules/lua added at e2ea3b31c9

1
win/win32/vs/NetHackW.vcxproj
View File

@@ -53,6 +53,7 @@
<ClCompile Include="$(LuaDir)lbitlib.c">
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.2'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(LuaDir)lcode.c" />

2
win/win32/vs/dirs.props
View File

@@ -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>

6
win/win32/vs/makedefs.vcxproj
View File

@@ -55,10 +55,10 @@
Outputs="$(IncDir)\nhlua.h">
<Message Text="Generating $(IncDir)nhlua.h" />
<Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../submodules/lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../lib/lua-$(LUA_VERSION)/src/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../submodules/lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../submodules/lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
</Target>
<Target Name="AfterBuild">