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

Merge branch 'NetHack-3.7' into header-order3.7

Browse Source
This commit is contained in:
nhmall
2020-07-07 20:10:25 -04:00
parent 1443ceecc5 a309518834
commit c95fe8c32b
23 changed files with 248 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
win/win32/vs2017/NetHack.vcxproj
View File

@@ -56,7 +56,10 @@
<ClCompile Include="$(LuaDir)lapi.c" />
<ClCompile Include="$(LuaDir)lauxlib.c" />
<ClCompile Include="$(LuaDir)lbaselib.c" />
<ClCompile Include="$(LuaDir)lbitlib.c" />
<ClCompile Include="$(LuaDir)lbitlib.c">
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(LuaDir)lcode.c" />
<ClCompile Include="$(LuaDir)lcorolib.c" />
<ClCompile Include="$(LuaDir)lctype.c" />

10
win/win32/vs2017/NetHackProperties.props
View File

@@ -5,6 +5,8 @@
<VERSION_MAJOR>3</VERSION_MAJOR>
<VERSION_MINOR>7</VERSION_MINOR>
<PATCHLEVEL>0</PATCHLEVEL>
<LUA_VERSION>5.4.0</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
@@ -21,5 +23,13 @@
<Value>$(PATCHLEVEL)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="LUA_VERSION">
<Value>$(LUA_VERSION)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="ADD_PACKAGE">
<Value>$(ADD_PACKAGE)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>
</Project>

5
win/win32/vs2017/NetHackW.vcxproj
View File

@@ -50,7 +50,10 @@
<ClCompile Include="$(LuaDir)lapi.c" />
<ClCompile Include="$(LuaDir)lauxlib.c" />
<ClCompile Include="$(LuaDir)lbaselib.c" />
<ClCompile Include="$(LuaDir)lbitlib.c" />
<ClCompile Include="$(LuaDir)lbitlib.c">
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="$(LuaDir)lcode.c" />
<ClCompile Include="$(LuaDir)lcorolib.c" />
<ClCompile Include="$(LuaDir)lctype.c" />

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

@@ -10,7 +10,7 @@
<DatDir>$(RootDir)dat\</DatDir>
<DocDir>$(RootDir)doc\</DocDir>
<IncDir>$(RootDir)include\</IncDir>
<LuaDir>$(RootDir)lib\lua-5.3.5\src\</LuaDir>
<LuaDir>$(RootDir)lib\lua-$(LUA_VERSION)\src\</LuaDir>
<SrcDir>$(RootDir)src\</SrcDir>
<SysDir>$(RootDir)sys\</SysDir>
<UtilDir>$(RootDir)util\</UtilDir>

6
win/win32/vs2017/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-5.3.5/src/lua.h%22 &gt;&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 LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../lib/lua-5.3.5/src/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo #include %22../lib/lua-5.3.5/src/lauxlib.h%22 &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 /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
</Target>
<Target Name="AfterBuild">

6
win/win32/vs2017/travisci.sh
View File

@@ -24,13 +24,13 @@ 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.3.5
export LUA_VERSION=5.4.0
mkdir -p lib
cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
#git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz
tar zxf lua-5.3.5.tar.gz
curl -R -O http://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz
tar zxf lua-$LUA_VERSION.tar.gz
#cd ctags
#nmake -f mk_mvc.mak
#cd ../../