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

fix 'make all' from src directory

Browse Source
This commit is contained in:
nhmall
2022-05-19 19:00:47 -04:00
parent 46e34b0826
commit 629b5d67a9
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sys/unix/Makefile.src
View File

@@ -465,7 +465,10 @@ PACKAGE=@true
MAKEDEFS = ../util/makedefs MAKEDEFS = ../util/makedefs
# -lm required by lua # -lm required by lua
LUALIB = ../lib/lua/liblua-$(LUA_VERSION).a -lm $(DLLIB) LUA_VERSION ?=5.4.4
LUABASE = liblua-$(LUA_VERSION).a
LUALIB = ../lib/lua/$(LUABASE)
LUALIBS = $(LUALIB) -lm $(DLLIB)
# timestamp files to reduce `make' overhead and shorten .o dependency lists # timestamp files to reduce `make' overhead and shorten .o dependency lists
CONFIG_H = ../src/config.h-t CONFIG_H = ../src/config.h-t
@@ -599,43 +602,43 @@ all: $(GAME)
pregame: pregame:
$(PREGAME) $(PREGAME)
$(GAME): pregame $(MAKEDEFS) $(SYSTEM) $(GAME): pregame $(MAKEDEFS) $(LUALIB) $(SYSTEM)
@echo "$(GAME) is up to date." @echo "$(GAME) is up to date."
Sysunix: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile Sysunix: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Linking $(GAME)." @echo "Linking $(GAME)."
$(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \ $(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
$(HOBJ) $(DATE_O) $(WINLIB) $(TARGET_LIBS) $(LUALIB) $(HOBJ) $(DATE_O) $(WINLIB) $(TARGET_LIBS) $(LUALIBS)
@touch Sysunix @touch Sysunix
Sys3B2: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile Sys3B2: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Linking $(GAME)." @echo "Linking $(GAME)."
$(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \ $(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
$(HOBJ) $(DATE_O) $(WINLIB) $(LUALIB) -lmalloc $(HOBJ) $(DATE_O) $(WINLIB) $(LUALIBS) -lmalloc
@touch Sys3B2 @touch Sys3B2
Sysatt: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile Sysatt: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Loading $(GAME)." @echo "Loading $(GAME)."
$(AT)$(LD) $(TARGET_LFLAGS) /lib/crt0s.o /lib/shlib.ifile \ $(AT)$(LD) $(TARGET_LFLAGS) /lib/crt0s.o /lib/shlib.ifile \
-o $(GAMEBIN) $(HOSTOBJ) $(HOBJ) $(DATE_O) $(LUALIB) -o $(GAMEBIN) $(HOSTOBJ) $(HOBJ) $(DATE_O) $(LUALIBS)
@touch Sysatt @touch Sysatt
Systos: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile Systos: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Linking $(GAME)." @echo "Linking $(GAME)."
$(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \ $(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
$(HOBJ) $(DATE_O) $(WINLIB) $(LUALIB) $(HOBJ) $(DATE_O) $(WINLIB) $(LUALIBS)
@touch Systos @touch Systos
SysV-AT: DUMB.Setup $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile SysV-AT: DUMB.Setup $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Linking $(GAME)." @echo "Linking $(GAME)."
$(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \ $(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
$(HOBJ) $(DATE_O) $(WINLIB) $(LUALIB) $(HOBJ) $(DATE_O) $(WINLIB) $(LUALIBS)
@touch SysV-AT @touch SysV-AT
SysBe: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile SysBe: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
@echo "Linking $(GAME)." @echo "Linking $(GAME)."
$(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAME) \ $(AT)$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAME) \
$(HOBJ) $(DATE_O) $(WINLIB) $(TARGET_LIBS) $(LUALIB) $(HOBJ) $(DATE_O) $(WINLIB) $(TARGET_LIBS) $(LUALIBS)
@xres -o $(GAME) ../win/BeOS/nethack.rsrc @xres -o $(GAME) ../win/BeOS/nethack.rsrc
@mimeset -f $(GAME) @mimeset -f $(GAME)
@touch SysBe @touch SysBe
@@ -660,7 +663,7 @@ DUMB.Setup: ../include/extern.h
cp ../include/extern.DUMB ../include/extern.h cp ../include/extern.DUMB ../include/extern.h
@touch DUMB.Setup @touch DUMB.Setup
../lib/lua/liblua-$(LUA_VERSION).a ../include/nhlua.h: $(LUALIB) ../include/nhlua.h:
@( cd .. ; $(MAKE) lua_support ) @( cd .. ; $(MAKE) lua_support )
# dependencies for makedefs and its outputs, which the util # dependencies for makedefs and its outputs, which the util