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

Merge branch 'pr645' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2021-12-28 08:43:07 -05:00
parent a194194039 67e7632e38
commit 2b197fbc33
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sys/unix/hints/linux.2020
View File

@@ -155,12 +155,13 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
../sys/share/ioctl.c ../sys/share/unixtty.c \ ../sys/share/ioctl.c ../sys/share/unixtty.c \
../sys/unix/unixunix.c ../sys/unix/unixres.c \ ../sys/unix/unixunix.c ../sys/unix/unixres.c \
../win/shim/winshim.c ../win/shim/winshim.c
LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \ LIBNHSYSOBJ = $(TARGETPFX)libnhmain.o $(TARGETPFX)ioctl.o \
unixres.o winshim.o $(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \
$(TARGETPFX)unixres.o $(TARGETPFX)winshim.o
#don't bother building the game executable as it will fail #don't bother building the game executable as it will fail
#without winshim #without winshim
override GAME= override GAME=
MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) $(TARGETPFX)libnh.a )
endif # WANT_LIBNH endif # WANT_LIBNH
#PREFIX=/usr #PREFIX=/usr
@@ -210,12 +211,12 @@ GAMEPERM = 0755
#-INCLUDE cross-post.2020 #-INCLUDE cross-post.2020
# #
ifdef WANT_LIBNH ifdef WANT_LIBNH
libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built." @echo "$@ built."
libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H) $(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<
endif # WANT_LIBNH endif # WANT_LIBNH
# #

13
sys/unix/hints/macOS.2020
View File

@@ -155,12 +155,13 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \
../sys/share/ioctl.c ../sys/share/unixtty.c \ ../sys/share/ioctl.c ../sys/share/unixtty.c \
../sys/unix/unixunix.c ../sys/unix/unixres.c \ ../sys/unix/unixunix.c ../sys/unix/unixres.c \
../win/shim/winshim.c ../win/shim/winshim.c
LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \ LIBNHSYSOBJ = $(TARGETPFX)libnhmain.o $(TARGETPFX)ioctl.o \
unixres.o winshim.o $(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \
$(TARGETPFX)unixres.o $(TARGETPFX)winshim.o
#don't bother building the game executable as it will fail #don't bother building the game executable as it will fail
#without winshim #without winshim
override GAME= override GAME=
MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnh.a ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) $(TARGETPFX)libnh.a )
endif # WANT_LIBNH endif # WANT_LIBNH
WANT_BUNDLE=1 WANT_BUNDLE=1
@@ -274,12 +275,12 @@ VARDIR=$(HACKDIR)
#-POST #-POST
ifdef WANT_LIBNH ifdef WANT_LIBNH
libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built." @echo "$@ built."
libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H) $(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<
endif # WANT_LIBNH endif # WANT_LIBNH