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

support for build with current Lua version 5.4.1

Browse Source 
This may require
	make spotless
	make fetch-lua
for some platforms.
This commit is contained in:
nhmall
2020-11-15 11:08:10 -05:00
parent 56494d3479
commit f965d187b8
16 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@
<ClCompile Include="$(LuaDir)lbaselib.c" />
<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.3.5'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(LuaDir)lcode.c" />

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

@@ -5,7 +5,7 @@
<VERSION_MAJOR>3</VERSION_MAJOR>
<VERSION_MINOR>7</VERSION_MINOR>
<PATCHLEVEL>0</PATCHLEVEL>
<LUA_VERSION>5.4.0</LUA_VERSION>
<LUA_VERSION>5.4.1</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup>
<PropertyGroup />

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

@@ -52,6 +52,7 @@
<ClCompile Include="$(LuaDir)lbaselib.c" />
<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.3.5'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(LuaDir)lcode.c" />
@@ -354,4 +355,4 @@
<Target Name="AfterRebuild">
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project>
</Project>

2
win/win32/vs/travisci.sh
View File

@@ -24,7 +24,7 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
export LUA_VERSION=5.4.0
export LUA_VERSION=5.4.1
mkdir -p lib
cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses