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

mextra follow up bit 3

Browse Source 
More Makefile tweaks
This commit is contained in:
nethack.allison
2006-01-07 13:38:29 +00:00
parent 580b5e62f1
commit 143790540b
12 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mkobj.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mkobj.c 3.5 2005/11/16 */
/* SCCS Id: @(#)mkobj.c 3.5 2006/01/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1086,7 +1086,7 @@ struct monst *mtmp;
mtmp2->nmon = (struct monst *)0;
mtmp2->data = (struct permonst *)0;
mtmp2->minvent = (struct obj *)0;
/* mon_to_buffer() took care of x and mname */
/* mon_to_buffer() took care of mextra */
#ifndef GOLDOBJ
/* not a pointer but is discarded along with minvent */
mtmp2->mgold = 0L;

2
src/monst.c
View File

@@ -5,8 +5,6 @@
#include "config.h"
#include "permonst.h"
#include "monsym.h"
#include "dungeon.h" /* prerequisite for eshk,vault,epri */
#include "mextra.h"
#define NO_ATTK {0,0,0,0}

4
sys/amiga/Makefile.agc
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.agc 3.5 2000/01/12
# SCCS Id: @(#)Makefile.agc 3.5 2006/01/07
# Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1991,1992,1993,1996.
# NetHack may be freely redistributed. See license for details.
@@ -1277,7 +1277,7 @@ $(I)permonst.h: $(I)monattk.h $(I)monflag.h $(I)align.h
-setdate $(I)permonst.h
-c:wait 2
$(I)you.h: $(I)align.h $(I)attrib.h $(I)monst.h $(I)youprop.h $(I)skills.h
$(I)you.h: $(I)align.h $(I)attrib.h $(I)monst.h $(I)mextra.h $(I)youprop.h $(I)skills.h
-setdate $(I)you.h
-c:wait 2

4
sys/amiga/Makefile.ami
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.ami 3.5 2002/21/02
# SCCS Id: @(#)Makefile.ami 3.5 2006/01/07
# Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1991,1992,1993,1996.
# NetHack may be freely redistributed. See license for details.
@@ -1616,7 +1616,7 @@ $(I)permonst.h: $(I)monattk.h $(I)monflag.h $(I)align.h
-setdate $(I)permonst.h
-wait 2
$(I)you.h: $(I)align.h $(I)attrib.h $(I)mextra.h $(I)monst.h $(I)youprop.h $(I)skills.h
$(I)you.h: $(I)align.h $(I)attrib.h $(I)monst.h $(I)mextra.h $(I)youprop.h $(I)skills.h
-setdate $(I)you.h
-wait 2

6
sys/msdos/Makefile.BC
View File

@@ -1,4 +1,4 @@
# SCCS Id: @(#)Makefile.BC 3.5 2006/01/05
# SCCS Id: @(#)Makefile.BC 3.5 2006/01/07
# Copyright (c) Yitzhak Sapir, 1999-2006.
# NetHack may be freely distributed. See license for details.
#
@@ -16,6 +16,8 @@
# This Makefile is specific to Borland's MAKE which is supplied with the
# compiler. It supports only one overlay management facility - VROOMM.
# (This Makefile won't work with make45l or NDMAKE)
#
# NOTE: This Makefile has not been tested with NetHack 3.5.x
#
# Game Installation Variables.
@@ -854,7 +856,7 @@ PCCONF_H = $(INCL)\pcconf.h $(INCL)\micro.h $(INCL)\system.h
PERMONST_H = $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\align.h
YOUPROP_H = $(INCL)\prop.h $(PERMONST_H) $(INCL)\pm.h $(INCL)\youprop.h \
$(INCL)\mondata.h
YOU_H = $(INCL)\attrib.h $(INCL)\mextra.h $(INCL)\monst.h $(YOUPROP_H) \
YOU_H = $(INCL)\attrib.h $(INCL)\monst.h $(INCL)\mextra.h $(YOUPROP_H) \
$(INCL)\align.h
DECL_H = $(INCL)\quest.h $(INCL)\spell.h $(INCL)\color.h \
$(INCL)\obj.h $(YOU_H) $(INCL)\onames.h $(INCL)\pm.h

6
sys/msdos/Makefile.GCC
View File

@@ -359,7 +359,7 @@ PATCHLEV_H = $(INCL)/patchlev.h
DGN_FILE_H = $(INCL)/align.h $(INCL)/dgn_file.h
DUNGEON_H = $(INCL)/align.h $(INCL)/dungeon.h
MONDATA_H = $(INCL)/align.h $(INCL)/mondata.h
MONST_H = $(INCL)/align.h $(INCL)/mextra.h $(INCL)/monst.h
MONST_H = $(INCL)/align.h $(INCL)/monst.h $(INCL)/mextra.h
PERMONST_H = $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/align.h \
$(INCL)/permonst.h
REGION_H = $(INCL)/region.h
@@ -866,7 +866,7 @@ $(O)drawing.o: $(CONFIG_H) drawing.c $(MSYS)/pcvideo.h
$(O)decl.o: $(CONFIG_H) decl.c
$(CC) $(cflags) -o$@ decl.c
$(O)monst.o: $(CONFIG_H) $(PERMONST_H) $(DUNGEON_H) $(INCL)/monsym.h \
$(O)monst.o: $(CONFIG_H) $(PERMONST_H) $(INCL)/monsym.h \
$(INCL)/color.h monst.c
$(CC) $(cflags) -o$@ monst.c
@@ -1211,7 +1211,7 @@ $(O)mondata.o: mondata.c $(HACK_H)
$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h
$(O)monst.o: monst.c $(CONFIG_H) $(INCL)/permonst.h $(INCL)/align.h \
$(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \
$(INCL)/dungeon.h $(INCL)/color.h
$(INCL)/color.h
$(O)mplayer.o: mplayer.c $(HACK_H)
$(O)mthrowu.o: mthrowu.c $(HACK_H)
$(O)muse.o: muse.c $(HACK_H)

7
sys/os2/Makefile.os2
View File

@@ -1,4 +1,4 @@
# SCCS Id: @(#)Makefile.os2 3.5 2006/01/05
# SCCS Id: @(#)Makefile.os2 3.5 2006/01/07
# OS/2 NetHack 3.5 Makefile for OS/2 versions 1.x and 2.x
# Copyright (C) 1990, 1991, 1992, 1993, 1996 Timo Hakulinen
#
@@ -709,9 +709,10 @@ OS2CONF_H = $(INCL)\os2conf.h $(INCL)\micro.h $(INCL)\system.h $(EXTERN_H)
GLOBAL_H = $(INCL)\global.h $(INCL)\coord.h $(OS2CONF_H)
CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h $(GLOBAL_H)
TRAP_H = $(INCL)\trap.h
PERMONST_H = $(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h $(INCL)\monflag.h
PERMONST_H = $(INCL)\permonst.h $(INCL)\monattk.h $(INCL)\monflag.h
YOU_H = $(INCL)\you.h $(INCL)\attrib.h $(PERMONST_H) $(INCL)\mondata.h \
$(INCL)\monst.h $(INCL)\youprop.h $(INCL)\prop.h $(INCL)\pm.h
$(INCL)\monst.h $(INCL)\mextra.h $(INCL)\youprop.h \
$(INCL)\prop.h $(INCL)\pm.h
DECL_H = $(INCL)\decl.h $(INCL)\spell.h $(INCL)\obj.h $(YOU_H) \
$(INCL)\onames.h $(INCL)\color.h
HACK_H = $(CONFIG_H) $(INCL)\context.h $(DECL_H) $(INCL)\monsym.h $(INCL)\mkroom.h \

15
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.5 2006/01/05
# SCCS Id: @(#)Makefile.src 3.5 2006/01/07
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
# recursive make calls if $(MAKE) is used
@@ -567,11 +567,12 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/align.h \
../include/wintype.h ../include/context.h ../include/decl.h \
../include/quest.h ../include/spell.h ../include/color.h \
../include/obj.h ../include/you.h ../include/attrib.h \
../include/monst.h ../include/skills.h ../include/onames.h \
../include/timeout.h ../include/trap.h ../include/flag.h \
../include/rm.h ../include/vision.h ../include/display.h \
../include/engrave.h ../include/rect.h ../include/region.h \
../include/winprocs.h ../include/wintty.h ../include/trampoli.h
../include/monst.h ../include/mextra.h ../include/skills.h \
../include/onames.h ../include/timeout.h ../include/trap.h \
../include/flag.h ../include/rm.h ../include/vision.h \
../include/display.h ../include/engrave.h ../include/rect.h \
../include/region.h ../include/winprocs.h ../include/wintty.h \
../include/trampoli.h
touch $(HACK_H)
#
tos.o: ../sys/atari/tos.c $(HACK_H) ../include/tcap.h
@@ -752,7 +753,7 @@ mondata.o: mondata.c $(HACK_H)
monmove.o: monmove.c $(HACK_H) ../include/mfndpos.h ../include/artifact.h
monst.o: monst.c $(CONFIG_H) ../include/permonst.h ../include/align.h \
../include/monattk.h ../include/monflag.h ../include/monsym.h \
../include/dungeon.h ../include/color.h
../include/color.h
mplayer.o: mplayer.c $(HACK_H)
mthrowu.o: mthrowu.c $(HACK_H)
muse.o: muse.c $(HACK_H)

7
sys/vms/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile (VMS) - for building nethack itself.
# SCCS Id: @(#)Makefile.src 3.5 2006/01/05
# SCCS Id: @(#)Makefile.src 3.5 2006/01/07
# Copy this file to [.src]Makefile. and then edit it as needed.
# The default configuration is for building with DEC C (aka Compaq C).
@@ -304,7 +304,8 @@ $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
$(INC)monflag.h $(INC)mondata.h $(INC)pm.h \
$(INC)wintype.h $(INC)context.h $(INC)decl.h $(INC)quest.h \
$(INC)spell.h $(INC)color.h $(INC)obj.h \
$(INC)you.h $(INC)attrib.h $(INC)monst.h $(INC)skills.h \
$(INC)you.h $(INC)attrib.h $(INC)monst.h \
$(INC)mextra.h $(INC)skills.h \
$(INC)onames.h $(INC)timeout.h $(INC)trap.h \
$(INC)flag.h $(INC)rm.h $(INC)vision.h \
$(INC)display.h $(INC)engrave.h $(INC)rect.h $(INC)region.h \
@@ -401,7 +402,7 @@ mondata.obj : mondata.c $(HACK_H)
monmove.obj : monmove.c $(HACK_H) $(INC)mfndpos.h $(INC)artifact.h
monst.obj : monst.c $(CONFIG_H) $(INC)permonst.h $(INC)align.h \
$(INC)monattk.h $(INC)monflag.h $(INC)monsym.h \
$(INC)dungeon.h $(INC)color.h
$(INC)color.h
mplayer.obj : mplayer.c $(HACK_H)
mthrowu.obj : mthrowu.c $(HACK_H)
muse.obj : muse.c $(HACK_H)

8
sys/winnt/Makefile.bcc
View File

@@ -475,13 +475,13 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\context.h $(INCL)\align.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \
$(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h \
$(INCL)\permonst.h $(INCL)\monattk.h \
$(INCL)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \
$(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \
$(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \
$(INCL)\you.h $(INCL)\attrib.h $(INCL)\monst.h \
$(INCL)\skills.h $(INCL)\onames.h $(INCL)\timeout.h \
$(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
$(INCL)\mextra.h $(INCL)\skills.h $(INCL)\onames.h \
$(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
$(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \
$(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h \
$(INCL)\wintty.h $(INCL)\trampoli.h
@@ -1314,7 +1314,7 @@ $(O)mondata.o: mondata.c $(HACK_H)
$(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h
$(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \
$(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \
$(INCL)\dungeon.h $(INCL)\color.h
$(INCL)\color.h
$(O)mplayer.o: mplayer.c $(HACK_H)
$(O)mthrowu.o: mthrowu.c $(HACK_H)
$(O)muse.o: muse.c $(HACK_H)

8
sys/winnt/Makefile.gcc
View File

@@ -431,13 +431,13 @@ CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \
HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
$(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
$(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \
$(INCL)/permonst.h $(INCL)/mextra.h $(INCL)/monattk.h \
$(INCL)/permonst.h $(INCL)/monattk.h \
$(INCL)/monflag.h $(INCL)/mondata.h $(INCL)/pm.h \
$(INCL)/wintype.h $(INCL)/decl.h $(INCL)/quest.h \
$(INCL)/spell.h $(INCL)/color.h $(INCL)/obj.h \
$(INCL)/you.h $(INCL)/attrib.h $(INCL)/monst.h \
$(INCL)/skills.h $(INCL)/onames.h $(INCL)/timeout.h \
$(INCL)/trap.h $(INCL)/flag.h $(INCL)/rm.h \
$(INCL)/mextra.h $(INCL)/skills.h $(INCL)/onames.h
$(INCL)/timeout.h $(INCL)/trap.h $(INCL)/flag.h $(INCL)/rm.h \
$(INCL)/vision.h $(INCL)/display.h $(INCL)/engrave.h \
$(INCL)/rect.h $(INCL)/region.h $(INCL)/winprocs.h \
$(INCL)/wintty.h $(INCL)/trampoli.h
@@ -1288,7 +1288,7 @@ $(O)mondata.o: mondata.c $(HACK_H)
$(O)monmove.o: monmove.c $(HACK_H) $(INCL)/mfndpos.h $(INCL)/artifact.h
$(O)monst.o: monst.c $(CONFIG_H) $(INCL)/permonst.h $(INCL)/align.h \
$(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/monsym.h \
$(INCL)/dungeon.h $(INCL)/color.h
$(INCL)/color.h
$(O)mplayer.o: mplayer.c $(HACK_H)
$(O)mthrowu.o: mthrowu.c $(HACK_H)
$(O)muse.o: muse.c $(HACK_H)

8
sys/winnt/Makefile.msc
View File

@@ -419,13 +419,13 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h $(INCL)\context.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \
$(INCL)\permonst.h $(INCL)\mextra.h $(INCL)\monattk.h \
$(INCL)\permonst.h $(INCL)\monattk.h \
$(INCL)\monflag.h $(INCL)\mondata.h $(INCL)\pm.h \
$(INCL)\wintype.h $(INCL)\decl.h $(INCL)\quest.h \
$(INCL)\spell.h $(INCL)\color.h $(INCL)\obj.h \
$(INCL)\you.h $(INCL)\attrib.h $(INCL)\monst.h \
$(INCL)\skills.h $(INCL)\onames.h $(INCL)\timeout.h \
$(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
$(INCL)\mextra.h $(INCL)\skills.h $(INCL)\onames.h \
$(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
$(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \
$(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h $(INCL)\botl.h \
$(INCL)\wintty.h $(INCL)\trampoli.h
@@ -1364,7 +1364,7 @@ $(O)mondata.o: mondata.c $(HACK_H)
$(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h
$(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \
$(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \
$(INCL)\dungeon.h $(INCL)\color.h
$(INCL)\color.h
$(O)mplayer.o: mplayer.c $(HACK_H)
$(O)mthrowu.o: mthrowu.c $(HACK_H)
$(O)muse.o: muse.c $(HACK_H)