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

build with the current Lua version 5.4.0 by default if not overridden

Browse Source
This commit is contained in:
nhmall
2020-07-07 17:36:23 -04:00
parent 2c571dcfe7
commit b967f73b96
19 changed files with 143 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+10 -10
View File
@@ -3,7 +3,7 @@ matrix:
include: include:
- name: linux-xenial-gcc - name: linux-xenial-gcc
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.3.5 env: HINTS=linux LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
script: script:
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -12,7 +12,7 @@ matrix:
- make install - make install
- name: linux-xenial-gcc-nocommon - name: linux-xenial-gcc-nocommon
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.3.5 env: HINTS=linux LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
script: script:
- echo "CFLAGS+=-fno-common" >>sys/unix/hints/$HINTS - echo "CFLAGS+=-fno-common" >>sys/unix/hints/$HINTS
@@ -22,7 +22,7 @@ matrix:
- make install - make install
- name: linux-bionic-gcc - name: linux-bionic-gcc
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.3.5 env: HINTS=linux LUA_VERSION=5.4.0
dist: bionic dist: bionic
compiler: gcc compiler: gcc
script: script:
@@ -32,7 +32,7 @@ matrix:
- make install - make install
- name: linux-xenial-clang - name: linux-xenial-clang
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.3.5 env: HINTS=linux LUA_VERSION=5.4.0
compiler: clang compiler: clang
script: script:
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -41,7 +41,7 @@ matrix:
- make install - make install
- name: linux-xenial-gcc-x11 - name: linux-xenial-gcc-x11
os: linux os: linux
env: HINTS=linux-x11 LUA_VERSION=5.3.5 env: HINTS=linux-x11 LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -56,7 +56,7 @@ matrix:
- make install - make install
- name: linux-xenial-gcc-qt5 - name: linux-xenial-gcc-qt5
os: linux os: linux
env: HINTS=linux-qt5 LUA_VERSION=5.3.5 env: HINTS=linux-qt5 LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -74,7 +74,7 @@ matrix:
- make QT_SELECT=5 MOC=moc install - make QT_SELECT=5 MOC=moc install
- name: linux-bionic-gcc-x11 - name: linux-bionic-gcc-x11
os: linux os: linux
env: HINTS=linux-x11 LUA_VERSION=5.3.5 env: HINTS=linux-x11 LUA_VERSION=5.4.0
dist: bionic dist: bionic
compiler: gcc compiler: gcc
addons: addons:
@@ -90,7 +90,7 @@ matrix:
- make install - make install
- name: linux-xenial-gcc-minimal - name: linux-xenial-gcc-minimal
os: linux os: linux
env: HINTS=linux-minimal LUA_VERSION=5.3.5 env: HINTS=linux-minimal LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
script: | script: |
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -128,7 +128,7 @@ matrix:
script: script:
- export ADD_CURSES=Y - export ADD_CURSES=Y
- export PDCURSES_TOP=../lib/pdcurses - export PDCURSES_TOP=../lib/pdcurses
- export LUA_VERSION=5.3.5 - export LUA_VERSION=5.4.0
- sh sys/winnt/travis-gcc.sh - sh sys/winnt/travis-gcc.sh
- test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/lua-$LUA_VERSION/src" || exit 0
- test -d "lib/pdcurses" || exit 0 - test -d "lib/pdcurses" || exit 0
@@ -137,7 +137,7 @@ matrix:
- mingw32-make install - mingw32-make install
- name: msdos-linuxhost-crosscompile - name: msdos-linuxhost-crosscompile
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.3.5 env: HINTS=linux LUA_VERSION=5.4.0
compiler: gcc compiler: gcc
script: script:
# - export # - export
Cross-compiling
+1 -1
View File
@@ -407,7 +407,7 @@ Using the cross-compiler, build the following targets:
b) Lua (mandatory in 3.7) b) Lua (mandatory in 3.7)
lib/lua-5.3.5/src lib/lua-5.4.0/src
from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c, from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c,
lcorolib.c, lctype.c, ldblib.c, ldebug.c, lcorolib.c, lctype.c, ldblib.c, ldebug.c,
Porting
+2 -2
View File
@@ -207,7 +207,7 @@ need to be included in the packaging of the game.
4.3. Lua 4.3. Lua
Compile and link into a library, or obtain a prebuilt Lua library for Compile and link into a library, or obtain a prebuilt Lua library for
your platform. Place the Lua source into lib/lua-5.3.5 (or other folder your platform. Place the Lua source into lib/lua-5.4.0 (or other folder
representing an appropriate Lua version); place the compiled Lua library into representing an appropriate Lua version); place the compiled Lua library into
lib. lib.
@@ -266,6 +266,6 @@ by code within the game itself. That was done to facilitate cross-compiling of
NetHack on one platform for game execution on another. NetHack on one platform for game execution on another.
# NetHack 3.6 Porting $NHDT-Date: 1524689603 2018/04/25 20:53:23 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.5 $ # NetHack 3.6 Porting $NHDT-Date: 1594155866 2020/07/07 21:04:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.8 $
# Copyright (c) 2005 by Michael Allison # Copyright (c) 2005 by Michael Allison
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
sys/msdos/Makefile.GCC
+15 -10
View File
@@ -1,4 +1,4 @@
# NetHack 3.6 Makefile.GCC $NHDT-Date: 1519600525 2018/02/25 23:15:25 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.34 $ # NetHack 3.6 Makefile.GCC $NHDT-Date: 1594155873 2020/07/07 21:04:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.51 $
# Copyright (c) NetHack PC Development Team 1996-2019. # Copyright (c) NetHack PC Development Team 1996-2019.
# PC NetHack 3.6 Makefile for djgpp V2 # PC NetHack 3.6 Makefile for djgpp V2
# #
@@ -38,11 +38,17 @@ GAMEDIR =../binary
ADD_CURSES=Y ADD_CURSES=Y
PDCURSES_TOP=../../pdcurses PDCURSES_TOP=../../pdcurses
#---------------------------------------------------------------
ifeq "$(LUA_VERSION)" "5.3.5"
LUAVER=5.3.5
else
LUAVER=5.4.0
endif
#--------------------------------------------------------------- #---------------------------------------------------------------
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # 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 # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -50,8 +56,7 @@ PDCURSES_TOP=../../pdcurses
# successfully build NetHack-3.7. # successfully build NetHack-3.7.
# #
ADD_LUA=Y ADD_LUA=Y
LUATOP=../lib/lua535 LUATOP=../lib/lua$(subst .,, $(LUAVER))
# #
#============================================================================== #==============================================================================
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
@@ -300,12 +305,12 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
#===============-================================================= #===============-=================================================
# LUA library # 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
#================================================================= #=================================================================
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
LUALIB = $(O)lua535s.a LUALIB = $(O)lua$(subst .,, $(LUAVER))s.a
LUADLL = $(O)lua535.a LUADLL = $(O)lua$(subst .,, $(LUAVER)).a
LUAINCL = -I$(LUASRC) LUAINCL = -I$(LUASRC)
#LUAFLAGS = unix added -lm here? #LUAFLAGS = unix added -lm here?
LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB) LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB)
@@ -951,14 +956,14 @@ $(PATCHLEV_H):
lua.exe: $(O)lua.o $(LUALIB) lua.exe: $(O)lua.o $(LUALIB)
$(link) $(LFLAGS) -o$@ $(O)lua.o $(LUALIB) $(link) $(LFLAGS) -o$@ $(O)lua.o $(LUALIB)
luac.exe: $(O)luac.o $(O)lua535s.a luac.exe: $(O)luac.o $(O)lua$(subst .,, $(LUAVER))s.a
$(link) $(LFLAGSU) -o$@ $(O)luac.o $(LUALIB) $(link) $(LFLAGSU) -o$@ $(O)luac.o $(LUALIB)
$(O)lua535.a: $(LUAOBJFILES) $(O)lua$(subst .,, $(LUAVER)).a: $(LUAOBJFILES)
$(cc) -shared -Wl,--export-all-symbols \ $(cc) -shared -Wl,--export-all-symbols \
-Wl,--add-stdcall-alias -o $@ $< -Wl,--add-stdcall-alias -o $@ $<
$(O)lua535s.a: $(LUAOBJFILES) $(O)lua$(subst .,, $(LUAVER))s.a: $(LUAOBJFILES)
ar rcS $@ $(LUAOBJFILES1) ar rcS $@ $(LUAOBJFILES1)
ar rcS $@ $(LUAOBJFILES2) ar rcS $@ $(LUAOBJFILES2)
ar rcs $@ $(LUAOBJFILES3) ar rcs $@ $(LUAOBJFILES3)
sys/msdos/Makefile1.cross
+10 -4
View File
@@ -312,13 +312,19 @@ $(HOST_O)prereq.tag: $(INCL)/nhlua.h hobj.tag $(U)makedefs \
$(HOST_O)utility.tag $(DAT)/nhdat $(HOST_O)utility.tag $(DAT)/nhdat
echo prereq done >$@ echo prereq done >$@
ifeq "$(LUA_VERSION)" "5.3.5"
LUAVER=5.3.5
else
LUAVER=5.4.0
endif
$(INCL)/nhlua.h: $(INCL)/nhlua.h:
cd $(INCL); \ cd $(INCL); \
echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \ echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \
echo '#include "../lib/lua-5.3.5/src/lua.h"' >> $@; \ echo '#include "../lib/lua-$(LUAVER)/src/lua.h"' >> $@; \
sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \ sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-$(LUAVER)/src/lua.h >> $@; \
echo '#include "../lib/lua-5.3.5/src/lualib.h"' >> $@; \ echo '#include "../lib/lua-$(LUAVER)/src/lualib.h"' >> $@; \
echo '#include "../lib/lua-5.3.5/src/lauxlib.h"' >> $@; \ echo '#include "../lib/lua-$(LUAVER)/src/lauxlib.h"' >> $@; \
echo '/*nhlua.h*/' >> $@; \ echo '/*nhlua.h*/' >> $@; \
cd $(SRC) cd $(SRC)
sys/msdos/Makefile2.cross
+19 -9
View File
@@ -43,11 +43,17 @@ PDCURSES_TOP=../lib/pdcurses
# Set top of djgpp if not specified through ENV variables prior to make: # Set top of djgpp if not specified through ENV variables prior to make:
#DJGPP_TOP = $(HOME)/lib/djgpp #DJGPP_TOP = $(HOME)/lib/djgpp
#---------------------------------------------------------------
ifeq "$(LUA_VERSION)" "5.3.5"
LUAVER=5.3.5
else
LUAVER=5.4.0
endif
#--------------------------------------------------------------- #---------------------------------------------------------------
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # 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 # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -55,7 +61,7 @@ PDCURSES_TOP=../lib/pdcurses
# successfully build NetHack-3.7. # successfully build NetHack-3.7.
# #
ADD_LUA=Y ADD_LUA=Y
LUATOP=../lib/lua-5.3.5 LUATOP=../lib/lua-$(LUAVER)
# #
# #
#============================================================================== #==============================================================================
@@ -308,18 +314,18 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
ifeq "$(ADD_LUA)" "Y" ifeq "$(ADD_LUA)" "Y"
#===============-================================================= #===============-=================================================
# LUA library # 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
#================================================================= #=================================================================
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
LUALIB = $(O)lua535s.a LUALIB = $(O)lua$(subst .,, $(LUAVER))s.a
#LUADLL = $(O)lua535.a #LUADLL = $(O)lua$(subst .,, $(LUAVER)).a
LUAINCL = -I$(LUASRC) LUAINCL = -I$(LUASRC)
#LUAFLAGS = unix added -lm here? #LUAFLAGS = unix added -lm here?
LUATARGETS = lua.exe luac.exe $(LUALIB) LUATARGETS = lua.exe luac.exe $(LUALIB)
#LUATARGETS = $(LUADLL) $(LUALIB) #LUATARGETS = $(LUADLL) $(LUALIB)
LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \
lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \ lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \
ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \ ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \
lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \ lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \
@@ -327,7 +333,7 @@ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \
ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \
lvm.c lzio.c lvm.c lzio.c
LUAOBJFILES1 = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ LUAOBJFILES1 = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
$(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o
LUAOBJFILES2 = $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ LUAOBJFILES2 = $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \
$(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o
@@ -336,7 +342,7 @@ LUAOBJFILES3 = $(O)lmathlib.o $(O)lmem.o $(O)loadlib.o $(O)lobject.o \
LUAOBJFILES4 = $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \ LUAOBJFILES4 = $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
$(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
#LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ #LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
# $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \ # $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \
# $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ # $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \
# $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \ # $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \
@@ -345,9 +351,13 @@ LUAOBJFILES4 = $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
# $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \ # $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
# $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o # $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
LUALIBOBJS = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) $(LUAOBJFILES4) ifeq "$(LUAVER)" "5.3.5"
LUASRCFILES = $(LUASRCFILES) lbitlib.c
LUAOBJFILES1 = $(LUAOBJFILES1) $(O)lbitlib.o
endif endif
LUALIBOBJS = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) $(LUAOBJFILES4)
endif
ifeq "$(ADD_CURSES)" "Y" ifeq "$(ADD_CURSES)" "Y"
#========================================== #==========================================
# PDCurses build macros # PDCurses build macros
sys/unix/Makefile.top
+2 -2
View File
@@ -1,5 +1,5 @@
# NetHack Top-level Makefile. # NetHack Top-level Makefile.
# NetHack 3.6 Makefile.top $NHDT-Date: 1589911654 2020/05/19 18:07:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.49 $ # NetHack 3.6 Makefile.top $NHDT-Date: 1594155882 2020/07/07 21:04:42 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.50 $
# Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -75,7 +75,7 @@ VARDAT = $(VARDATD) $(VARDATND)
#CHGRP = chgrp #CHGRP = chgrp
# Lua version # Lua version
LUA_VERSION = 5.3.5 LUA_VERSION = 5.4.0
# #
# end of configuration # end of configuration
sys/unix/NetHack.xcodeproj/project.pbxproj
+2 -2
View File
@@ -1381,7 +1381,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_INC_DIR}\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.3.5/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.3.5/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.3.5/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.3.5/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n"; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_INC_DIR}\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.0/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
}; };
544768B8239954B9004B9739 /* Build Lua library */ = { 544768B8239954B9004B9739 /* Build Lua library */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@@ -1400,7 +1400,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_LIB_DIR}\nmkdir -p lua\ncd ${NH_LIB_DIR}/lua-5.3.5/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n"; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_LIB_DIR}\nmkdir -p lua\ncd ${NH_LIB_DIR}/lua-5.4.0/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
sys/vms/Makefile.src
+16 -6
View File
@@ -1,5 +1,5 @@
# NetHack Makefile (VMS) - for building nethack itself. # NetHack Makefile (VMS) - for building nethack itself.
# NetHack 3.6 Makefile.src $NHDT-Date: 1573165004 2019/11/07 22:16:44 $ $NHDT-Branch: paxed-lua-v2-merged $:$NHDT-Revision: 1.38 $ # NetHack 3.6 Makefile.src $NHDT-Date: 1594155889 2020/07/07 21:04:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.50 $
# Copyright (c) 2011 by Robert Patrick Rankin # Copyright (c) 2011 by Robert Patrick Rankin
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -29,7 +29,7 @@ VMS = [-.sys.vms]
WINSHR = [-.win.share] WINSHR = [-.win.share]
X11 = [-.win.X11] X11 = [-.win.X11]
#LUA source tree parallel to NetHack tree in lua535 directory #LUA source tree parallel to NetHack tree in lua535 directory
LUA = [-.-.lua535.src] LUA = [-.-.lua540.src]
MAKEFILE= $(SRC)Makefile. MAKEFILE= $(SRC)Makefile.
# if you are using gcc as your compiler: # if you are using gcc as your compiler:
@@ -214,8 +214,17 @@ HOBJ = $(FIRSTOBJ) $(SYSOBJ) $(WINOBJ) $(RANDOBJ) \
$(HOBJ1) $(HOBJ2) $(HOBJ3) $(HOBJ4) $(HOBJ5) $(HOBJ6) $(HOBJ1) $(HOBJ2) $(HOBJ3) $(HOBJ4) $(HOBJ5) $(HOBJ6)
LUAOBJ = nhlua.o,nhlsel.o LUAOBJ = nhlua.o,nhlsel.o
# 5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
# so comment top two and uncomment bottom two for the previous version (5.3.5)
LUA535SRCFILES =
LUA535OBJFILES =
#LUA535SRCFILES = $(LUA)lbitlib.c
#LUA535OBJFILES = lbitlib.o,
endif
LUALIBSRC = $(LUA)lapi.c $(LUA)lauxlib.c $(LUA)lbaselib.c \ LUALIBSRC = $(LUA)lapi.c $(LUA)lauxlib.c $(LUA)lbaselib.c \
$(LUA)lbitlib.c $(LUA)lcode.c $(LUA)lcorolib.c \ $(LUA535SRCFILES) $(LUA)lcode.c $(LUA)lcorolib.c \
$(LUA)lctype.c $(LUA)ldblib.c $(LUA)ldebug.c \ $(LUA)lctype.c $(LUA)ldblib.c $(LUA)ldebug.c \
$(LUA)ldo.c $(LUA)ldump.c $(LUA)lfunc.c $(LUA)lgc.c \ $(LUA)ldo.c $(LUA)ldump.c $(LUA)lfunc.c $(LUA)lgc.c \
$(LUA)linit.c $(LUA)liolib.c $(LUA)llex.c \ $(LUA)linit.c $(LUA)liolib.c $(LUA)llex.c \
@@ -226,7 +235,7 @@ LUALIBSRC = $(LUA)lapi.c $(LUA)lauxlib.c $(LUA)lbaselib.c \
$(LUA)ltm.c $(LUA)lundump.c $(LUA)lutf8lib.c \ $(LUA)ltm.c $(LUA)lundump.c $(LUA)lutf8lib.c \
$(LUA)lvm.c $(LUA)lzio.c $(LUA)lvm.c $(LUA)lzio.c
LUALIBOBJ1 = lapi.obj,lauxlib.obj,lbaselib.obj,lbitlib.obj, \ LUALIBOBJ1 = lapi.obj,lauxlib.obj,lbaselib.obj, $(LUA535OBJFILES) \
lcode.obj,lcorolib.obj,lctype.obj,ldblib.obj lcode.obj,lcorolib.obj,lctype.obj,ldblib.obj
LUALIBOBJ2 = ldebug.obj,ldo.obj,ldump.obj,lfunc.obj, \ LUALIBOBJ2 = ldebug.obj,ldo.obj,ldump.obj,lfunc.obj, \
lgc.obj,linit.obj,liolib.obj,llex.obj lgc.obj,linit.obj,liolib.obj,llex.obj
@@ -448,11 +457,12 @@ wintext.obj : $(X11)wintext.c $(HACK_H) $(INC)winX.h $(INC)xwindow.h
winval.obj : $(X11)winval.c $(HACK_H) $(INC)winX.h winval.obj : $(X11)winval.c $(HACK_H) $(INC)winX.h
tile.obj : $(SRC)tile.c $(HACK_H) tile.obj : $(SRC)tile.c $(HACK_H)
vis_tab.obj : vis_tab.c $(CONFIG_H) $(INC)vis_tab.h vis_tab.obj : vis_tab.c $(CONFIG_H) $(INC)vis_tab.h
# lua 5.3.5 code # lua 5.4.0 code
lapi.obj : $(LUA)lapi.c lapi.obj : $(LUA)lapi.c
lauxlib.obj : $(LUA)lauxlib.c lauxlib.obj : $(LUA)lauxlib.c
lbaselib.obj : $(LUA)lbaselib.c lbaselib.obj : $(LUA)lbaselib.c
lbitlib.obj : $(LUA)lbitlib.c #uncomment this for 5.3.5
#lbitlib.obj : $(LUA)lbitlib.c
lcode.obj : $(LUA)lcode.c lcode.obj : $(LUA)lcode.c
lcorolib.obj : $(LUA)lcorolib.c lcorolib.obj : $(LUA)lcorolib.c
lctype.obj : $(LUA)lctype.c lctype.obj : $(LUA)lctype.c
sys/winnt/Install.nt
+2 -2
View File
@@ -5,7 +5,7 @@
NetHack 3.7 on a Windows system NetHack 3.7 on a Windows system
(Windows 7/8.x/10 or later only) (Windows 7/8.x/10 or later only)
============================================================== ==============================================================
Last revision: $NHDT-Date: 1575245156 2019/12/02 00:05:56 $ Last revision: $NHDT-Date: 1594155895 2020/07/07 21:04:55 $
Credit for the porting of NetHack to the Win32 Console Subsystem goes to Credit for the porting of NetHack to the Win32 Console Subsystem goes to
the NT Porting Team started by Michael Allison. the NT Porting Team started by Michael Allison.
@@ -47,7 +47,7 @@ version. You can use one of the following build environments:
| | | | | |
+----+ +------+ +-----------+ +----+ +------+ +-----------+
| | | | | | | | | | | |
share winnt tty win32 Lua-5.3.5 pdcurses share winnt tty win32 Lua-5.4.0 pdcurses
| |
vs2017 vs2017
sys/winnt/Makefile.gcc
+21 -11
View File
@@ -1,4 +1,4 @@
# NetHack 3.7 Makefile.gcc $NHDT-Date: 1546174698 2018/12/30 12:58:18 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.71 $ # NetHack 3.7 Makefile.gcc $NHDT-Date: 1594155895 2020/07/07 21:04:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.109 $
# Copyright (c) 2010 by Michael Allison # Copyright (c) 2010 by Michael Allison
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
# #
@@ -126,10 +126,16 @@ TARGET_CPU=x86
# x86libs or x64libs depending on whether you're building for 64 bits. # x86libs or x64libs depending on whether you're building for 64 bits.
# #
#--------------------------------------------------------------- #---------------------------------------------------------------
ifndef LUA_VERSION
LUAVER=5.4.0
else
LUAVER=$(LUA_VERSION)
endif
#---------------------------------------------------------------
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # 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 # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -137,11 +143,7 @@ TARGET_CPU=x86
# successfully build NetHack-3.7. # successfully build NetHack-3.7.
# #
ADD_LUA=Y ADD_LUA=Y
LUATOP=../lib/lua-5.3.5 LUATOP=../lib/lua-$(LUAVER)
ifndef LUA_VERSION
LUA_VERSION=5.3.5
endif
# #
#============================================================================== #==============================================================================
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
@@ -412,10 +414,12 @@ OPTIONS_FILE = $(DAT)\options
#===============-================================================= #===============-=================================================
# LUA library # 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
#================================================================= #=================================================================
LUAVER = 5.3.5 ifndef LUAVER
LUAVER = 5.4.0
endif
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
LUALIB = $(O)lua-$(LUAVER).static.a LUALIB = $(O)lua-$(LUAVER).static.a
LUADLL = $(O)lua-$(LUAVER).a LUADLL = $(O)lua-$(LUAVER).a
@@ -423,7 +427,7 @@ LUAINCL = -I$(LUASRC)
#LUAFLAGS = unix added -lm here? #LUAFLAGS = unix added -lm here?
LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB) LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB)
LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \
lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \ lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \
ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \ ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \
lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \ lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \
@@ -431,7 +435,7 @@ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \
ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \
lvm.c lzio.c lvm.c lzio.c
LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
$(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \ $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \
$(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \
$(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \ $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \
@@ -439,6 +443,12 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \
$(O)lopcodes.o $(O)loslib.o $(O)lparser.o $(O)lstate.o \ $(O)lopcodes.o $(O)loslib.o $(O)lparser.o $(O)lstate.o \
$(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \ $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
$(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
ifeq "$(LUAVER)" "5.3.5"
# 5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
# so we have to tack those on for the previous version (5.3.5)
LUASRCFILES = $(LUASRCFILES) lbitlib.c
LUAOBJFILES = $(LUAOBJFILES) lbitlib.o
endif
ifeq "$(ADD_CURSES)" "Y" ifeq "$(ADD_CURSES)" "Y"
#========================================== #==========================================
sys/winnt/Makefile.msc
+16 -9
View File
@@ -130,12 +130,17 @@ DEBUGINFO = Y
#============================================================================== #==============================================================================
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
#============================================================================== #==============================================================================
!IFNDEF LUA_VERSION
LUAVER=5.4.0
!ELSE
LUAVER=$(LUA_VERSION)
!ENDIF
#============================================================================== #==============================================================================
# #
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # 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 # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # 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 # successfully build NetHack-3.7. You cannot build a functional
# version of NetHack-3.7 Work-in-progress without including Lua. # 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 # 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 !IFDEF LUATOP
LUATMP = $(LUATOP:..\..\lua-=) #strip leading "..\..\lua-" LUATMP = $(LUATOP:..\lib\lua-=) #strip leading "..\lib\lua-"
LUATMP = $(LUATMP:-beta=) #strip suffix if exists "-beta" LUATMP = $(LUATMP:-beta=) #strip suffix if exists "-beta"
!IF "$(LUATMP)" == "5.4.0" !IF "$(LUATMP)" == "5.4.0"
LUAVER = 5.4.0 LUAVER = 5.4.0
@@ -394,12 +400,13 @@ LUAVER = 5.4.0
!ENDIF !ENDIF
!IFNDEF LUAVER !IFNDEF LUAVER
LUATMP = $(LUATOP:..\..\LUA-=) #strip leading "..\..\LUA-" LUATMP = $(LUATOP:..\lib\LUA-=) #strip leading "..\lib\LUA-"
LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA" LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA"
!IF "$(LUATMP)" == "5.4.0" !IF "$(LUATMP)" == "5.3.5"
LUAVER = 5.4.0
!ELSE
LUAVER = 5.3.5 LUAVER = 5.3.5
!ELSE
LUAVER = 5.4.0
!ENDIF
!ENDIF !ENDIF
!ENDIF !ENDIF
@@ -429,7 +436,7 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
!IF "$(LUAVER)" == "5.3.5" !IF "$(LUAVER)" == "5.3.5"
LUASRCFILES = $(LUASRCFILES) lbitlib.c LUASRCFILES = $(LUASRCFILES) lbitlib.c
LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o
!ELSEIF "$(LUAVER)" == "5.4.0" !ELSE
# 5.4.0 adds header files ljumptab.h and lopnames.h # 5.4.0 adds header files ljumptab.h and lopnames.h
# and removes lbitlib.c # and removes lbitlib.c
!ENDIF !ENDIF
sys/winnt/travis-gcc.sh
+2 -2
View File
@@ -3,6 +3,6 @@ mkdir -p lib
cd lib cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
#git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags #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 curl -R -O http://www.lua.org/ftp/lua-5.4.0.tar.gz
tar zxf lua-5.3.5.tar.gz tar zxf lua-5.4.0.tar.gz
cd ../ cd ../
win/win32/vs2017/NetHack.vcxproj
+4 -1
View File
@@ -56,7 +56,10 @@
<ClCompile Include="$(LuaDir)lapi.c" /> <ClCompile Include="$(LuaDir)lapi.c" />
<ClCompile Include="$(LuaDir)lauxlib.c" /> <ClCompile Include="$(LuaDir)lauxlib.c" />
<ClCompile Include="$(LuaDir)lbaselib.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)lcode.c" />
<ClCompile Include="$(LuaDir)lcorolib.c" /> <ClCompile Include="$(LuaDir)lcorolib.c" />
<ClCompile Include="$(LuaDir)lctype.c" /> <ClCompile Include="$(LuaDir)lctype.c" />
win/win32/vs2017/NetHackProperties.props
+10
View File
@@ -5,6 +5,8 @@
<VERSION_MAJOR>3</VERSION_MAJOR> <VERSION_MAJOR>3</VERSION_MAJOR>
<VERSION_MINOR>7</VERSION_MINOR> <VERSION_MINOR>7</VERSION_MINOR>
<PATCHLEVEL>0</PATCHLEVEL> <PATCHLEVEL>0</PATCHLEVEL>
<LUA_VERSION>5.4.0</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup /> <ItemDefinitionGroup />
@@ -21,5 +23,13 @@
<Value>$(PATCHLEVEL)</Value> <Value>$(PATCHLEVEL)</Value>
<EnvironmentVariable>true</EnvironmentVariable> <EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro> </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> </ItemGroup>
</Project> </Project>
win/win32/vs2017/NetHackW.vcxproj
+4 -1
View File
@@ -50,7 +50,10 @@
<ClCompile Include="$(LuaDir)lapi.c" /> <ClCompile Include="$(LuaDir)lapi.c" />
<ClCompile Include="$(LuaDir)lauxlib.c" /> <ClCompile Include="$(LuaDir)lauxlib.c" />
<ClCompile Include="$(LuaDir)lbaselib.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)lcode.c" />
<ClCompile Include="$(LuaDir)lcorolib.c" /> <ClCompile Include="$(LuaDir)lcorolib.c" />
<ClCompile Include="$(LuaDir)lctype.c" /> <ClCompile Include="$(LuaDir)lctype.c" />
win/win32/vs2017/dirs.props
+1 -1
View File
@@ -10,7 +10,7 @@
<DatDir>$(RootDir)dat\</DatDir> <DatDir>$(RootDir)dat\</DatDir>
<DocDir>$(RootDir)doc\</DocDir> <DocDir>$(RootDir)doc\</DocDir>
<IncDir>$(RootDir)include\</IncDir> <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> <SrcDir>$(RootDir)src\</SrcDir>
<SysDir>$(RootDir)sys\</SysDir> <SysDir>$(RootDir)sys\</SysDir>
<UtilDir>$(RootDir)util\</UtilDir> <UtilDir>$(RootDir)util\</UtilDir>
win/win32/vs2017/makedefs.vcxproj
+3 -3
View File
@@ -55,10 +55,10 @@
Outputs="$(IncDir)\nhlua.h"> Outputs="$(IncDir)\nhlua.h">
<Message Text="Generating $(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 /* 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 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-$(LUA_VERSION)/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/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
<Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/> <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
win/win32/vs2017/travisci.sh
+3 -3
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\)/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/ucrt/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/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 mkdir -p lib
cd lib cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
#git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags #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 curl -R -O http://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz
tar zxf lua-5.3.5.tar.gz tar zxf lua-$LUA_VERSION.tar.gz
#cd ctags #cd ctags
#nmake -f mk_mvc.mak #nmake -f mk_mvc.mak
#cd ../../ #cd ../../