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

lua on Unix tinkering

Browse Source 
The base Makefile hasn't been using the '+=' construct, so take
out the one used for lua (post 3.6.6).

Only the 'Sysunix' target has been tested.
This commit is contained in:
PatR
2020-07-30 06:25:43 -07:00
parent 5a072c4202
commit 7f1420558a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1595989869 2020/07/29 02:31:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.104 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1596115531 2020/07/30 13:25:31 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.105 $
# Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details.
@@ -49,7 +49,7 @@ SHELL=/bin/sh
# for UNIX systems
SYSSRC = ../sys/share/ioctl.c ../sys/share/unixtty.c ../sys/unix/unixmain.c \
../sys/unix/unixunix.c ../sys/unix/unixres.c
SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o ../lib/lua/liblua.a
SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o
#
# for Systos
# SYSSRC = ../sys/atari/tos.c ../sys/share/pcmain.c ../sys/share/pcsys.c \
@@ -173,9 +173,6 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o ../lib/lua/liblua.a
#CFLAGS = -O -I../include
#LFLAGS =
# -lm required by lua
LIBS += -lm
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in.
@@ -447,6 +444,9 @@ AT = $(AT_V$(QUIETCC))
MAKEDEFS = ../util/makedefs
# -lm required by lua
LUALIB = ../lib/lua/liblua.a -lm
# timestamp files to reduce `make' overhead and shorten .o dependency lists
CONFIG_H = ../src/config.h-t
HACK_H = ../src/hack.h-t
@@ -550,32 +550,33 @@ $(GAME): $(SYSTEM)
Sysunix: $(HOBJ) Makefile
@echo "Linking $(GAME)."
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) $(LUALIB)
@touch Sysunix
Sys3B2: $(HOBJ) Makefile
@echo "Linking $(GAME)."
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LUALIB) -lmalloc
@touch Sys3B2
Sysatt: $(HOBJ) Makefile
@echo "Loading $(GAME)."
$(AT)$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ)
$(AT)$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ) \
$(LUALIB)
@touch Sysatt
Systos: $(HOBJ) Makefile
@echo "Linking $(GAME)."
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LUALIB)
@touch Systos
SysV-AT: DUMB.Setup $(HOBJ) Makefile
@echo "Linking $(GAME)."
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LUALIB)
@touch SysV-AT
SysBe: $(HOBJ) Makefile
@echo "Linking $(GAME)."
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
$(AT)$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) $(LUALIB)
@xres -o $(GAME) ../win/BeOS/nethack.rsrc
@mimeset -f $(GAME)
@touch SysBe