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

25
sys/winnt/Makefile.msc
View File

@@ -130,12 +130,17 @@ DEBUGINFO = Y
#==============================================================================
# This marks the end of the BUILD DECISIONS section.
#==============================================================================
!IFNDEF LUA_VERSION
LUAVER=5.4.0
!ELSE
LUAVER=$(LUA_VERSION)
!ENDIF
#==============================================================================
#
# Location of LUA
#
# Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.3.5.tar.gz
# http://www.lua.org/ftp/lua-5.4.0.tar.gz
#
# This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere
@@ -143,7 +148,7 @@ DEBUGINFO = Y
# successfully build NetHack-3.7. You cannot build a functional
# version of NetHack-3.7 Work-in-progress without including Lua.
#
LUATOP=..\lib\lua-5.3.5
LUATOP=..\lib\lua-$(LUAVER)
#
#
#==============================================================================
@@ -380,11 +385,12 @@ OPTIONS_FILE = $(DAT)\options
#===============-=================================================
# LUA library
# Source from http://www.lua.org/ftp/lua-5.3.5.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
#=================================================================
!IFNDEF LUAVER
!IFDEF LUATOP
LUATMP = $(LUATOP:..\..\lua-=) #strip leading "..\..\lua-"
LUATMP = $(LUATOP:..\lib\lua-=) #strip leading "..\lib\lua-"
LUATMP = $(LUATMP:-beta=) #strip suffix if exists "-beta"
!IF "$(LUATMP)" == "5.4.0"
LUAVER = 5.4.0
@@ -394,12 +400,13 @@ LUAVER = 5.4.0
!ENDIF
!IFNDEF LUAVER
LUATMP = $(LUATOP:..\..\LUA-=) #strip leading "..\..\LUA-"
LUATMP = $(LUATOP:..\lib\LUA-=) #strip leading "..\lib\LUA-"
LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA"
!IF "$(LUATMP)" == "5.4.0"
LUAVER = 5.4.0
!ELSE
!IF "$(LUATMP)" == "5.3.5"
LUAVER = 5.3.5
!ELSE
LUAVER = 5.4.0
!ENDIF
!ENDIF
!ENDIF
@@ -429,7 +436,7 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
!IF "$(LUAVER)" == "5.3.5"
LUASRCFILES = $(LUASRCFILES) lbitlib.c
LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o
!ELSEIF "$(LUAVER)" == "5.4.0"
!ELSE
# 5.4.0 adds header files ljumptab.h and lopnames.h
# and removes lbitlib.c
!ENDIF