Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2019-02-10 18:22:02 -05:00
5 changed files with 36 additions and 19 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
# NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1546220381 2018/12/31 01:39:41 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.67 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1549834883 2019/02/10 21:41:23 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.69 $
# Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details.
@@ -1013,7 +1013,7 @@ fountain.o: fountain.c $(HACK_H)
hack.o: hack.c $(HACK_H)
hacklib.o: hacklib.c $(HACK_H)
invent.o: invent.c $(HACK_H)
isaac64.o: isaac64.c ../include/isaac64.h ../include/integer.h
isaac64.o: isaac64.c $(CONFIG_H) ../include/isaac64.h ../include/integer.h
light.o: light.c $(HACK_H) ../include/lev.h
lock.o: lock.c $(HACK_H)
mail.o: mail.c $(HACK_H) ../include/mail.h
+7 -5
View File
@@ -1,10 +1,11 @@
# NetHack Makefile (VMS) - for building nethack itself.
# NetHack 3.6 Makefile.src $NHDT-Date: 1543545915 2018/11/30 02:45:15 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.32 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1549835645 2019/02/10 21:54:05 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.33 $
# Copyright (c) 2011 by Robert Patrick Rankin
# NetHack may be freely redistributed. See license for details.
# Copy this file to [.src]Makefile. and then edit it as needed.
# The default configuration is for building with DEC C (aka Compaq C).
# The default configuration is for building with DEC C (aka Compaq C,
# then HP C).
# If you change CC or CFLAGS, make similar changes in [.util]Makefile.
#
# Note: modifying this Makefile will cause crtl.opt to be rebuilt,
@@ -88,9 +89,9 @@ WINOBJ = $(WINTTYOBJ)
SYSTEM = SysVMS.timestamp;
GAME = $(SRC)nethack.exe;
# RANDOM is defined in vmsconf.h
RANDSRC = random.c
RANDOBJ = random.obj
# RANDOM is defined in vmsconf.h, USE_ISAAC64 might be defined in config.h;
RANDSRC = isaac64.c random.c
RANDOBJ = isaac64.obj,random.obj
# ----------------------------------------
#
@@ -343,6 +344,7 @@ vmsfiles.obj : $(VMS)vmsfiles.c $(CONFIG_H)
vmsmail.obj : $(VMS)vmsmail.c $(CONFIG_H) $(INC)mail.h \
$(INC)wintype.h $(INC)winprocs.h
# conditionally used code -- VMS always wants these
isaac64.obj : isaac64.c
random.obj : random.c $(HACK_H)
random.c : $(SYSSHR)random.c
copy $(SYSSHR)random.c random.c
+2 -1
View File
@@ -1,6 +1,6 @@
$ ! vms/vmsbuild.com -- compile and link NetHack 3.6.* [pr]
$ version_number = "3.6.2"
$ ! $NHDT-Date: 1542847646 2018/11/22 00:47:26 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.20 $
$ ! $NHDT-Date: 1549835647 2019/02/10 21:54:07 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.21 $
$ ! Copyright (c) 2018 by Robert Patrick Rankin
$ ! NetHack may be freely redistributed. See license for details.
$ !
@@ -262,6 +262,7 @@ $ set default [-.src]
$! compile most of the source files:
$ c_list = "decl,version,[-.sys.vms]vmsmain,[-.sys.vms]vmsunix" -
+ ",[-.sys.vms]vmstty,[-.sys.vms]vmsmail" -
+ ",[]isaac64" - !already in [.src]
+ ",[]random,[]tclib,[]pmatchregex" !copied from [-.sys.share]
$ gosub compile_list
$ c_list = "[-.win.tty]getline,[-.win.tty]termcap" -