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

Modify mingw makefile to allow caller to specify LUA build parameters.

Browse Source
This commit is contained in:
Bart House
2020-12-15 02:20:11 -08:00
parent b08b47749f
commit a7b47ff071
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
azure-pipelines.yml
+4
View File
@@ -110,6 +110,10 @@ steps:
displayName: 'Windows MSBuild' displayName: 'Windows MSBuild'
- bash: | - bash: |
export ADD_LUA=Y
export WANT_LUAC=N
export LUATOP=../submodules/lua
export LUASRC=../submodules/lua
export ADD_CURSES=Y export ADD_CURSES=Y
export PDCURSES_TOP=../submodules/pdcurses export PDCURSES_TOP=../submodules/pdcurses
export LUA_VERSION=5.4.2 export LUA_VERSION=5.4.2
sys/winnt/Makefile.gcc
+9
View File
@@ -142,8 +142,11 @@ endif
# you'll need to specify the correct spot below in order to # you'll need to specify the correct spot below in order to
# successfully build NetHack-3.7. # successfully build NetHack-3.7.
# #
ifndef ADD_LUA
ADD_LUA=Y ADD_LUA=Y
LUATOP=../lib/lua-$(LUAVER) LUATOP=../lib/lua-$(LUAVER)
WANT_LUAC=Y
endif
# #
#============================================================================== #==============================================================================
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
@@ -422,12 +425,18 @@ OPTIONS_FILE = $(DAT)\options
ifndef LUAVER ifndef LUAVER
LUAVER = 5.4.2 LUAVER = 5.4.2
endif endif
ifndef LUASRC
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
endif
LUALIB = $(O)lua-$(LUAVER).static.a LUALIB = $(O)lua-$(LUAVER).static.a
LUADLL = $(O)lua-$(LUAVER).a LUADLL = $(O)lua-$(LUAVER).a
LUAINCL = -I$(LUASRC) LUAINCL = -I$(LUASRC)
#LUAFLAGS = unix added -lm here? #LUAFLAGS = unix added -lm here?
ifeq "$(WANT_LUAC)" "Y"
LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB) LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB)
else
LUATARGETS = lua.exe $(LUADLL) $(LUALIB)
endif
LUASRCFILES = lapi.c lauxlib.c lbaselib.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 \