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

placement of libnethack targets required adjusting

Browse Source 
From -PRE to -POST section
This commit is contained in:
nhmall
2020-10-04 21:12:03 -04:00
parent d8961b0067
commit ac493aa455
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/hints/linux.2020
+11 -8
View File
@@ -176,14 +176,7 @@ LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
#without winshim #without winshim
override GAME= override GAME=
MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a endif # WANT_LIBNH
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built."
libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
endif # BUILD_LIBNH
#PREFIX=/usr #PREFIX=/usr
PREFIX=$(wildcard ~)/nh/install PREFIX=$(wildcard ~)/nh/install
@@ -231,3 +224,13 @@ GAMEPERM = 0755
# #
#-INCLUDE cross-post.2020 #-INCLUDE cross-post.2020
# #
ifdef WANT_LIBNH
libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built."
libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
endif # WANT_LIBNH
#
sys/unix/hints/macOS.2020
+9 -7
View File
@@ -183,13 +183,6 @@ LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
#without winshim #without winshim
override GAME= override GAME=
MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built."
libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
endif # WANT_LIBNH endif # WANT_LIBNH
WANT_BUNDLE=1 WANT_BUNDLE=1
@@ -301,6 +294,15 @@ VARDIR=$(HACKDIR)
#-INCLUDE cross-pre.2020 #-INCLUDE cross-pre.2020
# #
#-POST #-POST
ifdef WANT_LIBNH
libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built."
libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $<
endif # WANT_LIBNH
ifdef MAKEFILE_TOP ifdef MAKEFILE_TOP
### ###