annotate rogue3/Makefile.in @ 111:7f8f43943b1f

Fix some terribly depressing corruption during restore. In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay if the daemon slot is empty. Unfortunately that code ended up on the wrong side of the brace that closes the for loop, so instead of running after each daemon, it got run once after the loop exited, when the index was of course out of bounds. This tended to manifest, when compiled with -O2, by overwriting hw and setting it to NULL. When inventory() next ran, hw would be passed to wgetch(), which returns ERR when it gets a NULL argument. This made md_readchar() think something was wrong and autosave the game. Upon investigation, rogue3 was found to commit the same mistake. rogue4 and srogue don't zero the data. arogue5 already does it properly. Someday I am going to run all this through Valgrind. Someday when I am a kinder person who will not be driven to invoke hordes of trolls and centaurs upon the original authors.
author John "Elwin" Edwards
date Wed, 08 Jan 2014 16:44:16 -0500
parents 53e69c17c313
children 97f8fdf9595c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
1 #
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
2 # Makefile for rogue
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
3 # %W% (Berkeley) %G%
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
4 #
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
5 # Rogue: Exploring the Dungeons of Doom
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
6 # Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
7 # All rights reserved.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
8 #
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
9 # See the file LICENSE.TXT for full copyright and licensing information.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
10 #
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
11
92
53e69c17c313 rogue3: set missing Makefile variables.
John "Elwin" Edwards
parents: 91
diff changeset
12 DISTNAME=@PACKAGE_TARNAME@@PACKAGE_VERSION@
53e69c17c313 rogue3: set missing Makefile variables.
John "Elwin" Edwards
parents: 91
diff changeset
13 PACKAGE_TARNAME=@PACKAGE_TARNAME@-@PACKAGE_VERSION@
88
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents: 20
diff changeset
14 PROGRAM=@PROGRAM@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
15
91
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
16 SCOREFILE=@SCOREFILE@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
17 LOGFILE=@LOGFILE@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
18 SAVEDIR=@SAVEDIR@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
19 GROUPOWNER=@GROUPOWNER@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
20
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
21 DESTDIR=
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
22 prefix=@prefix@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
23 exec_prefix=@exec_prefix@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
24 datarootdir=@datarootdir@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
25 bindir=@bindir@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
26 mandir=@mandir@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
27 man6dir=$(mandir)/man6
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
28 docdir=@docdir@
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
29
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
30
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
31 O=o
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
32
91
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
33 HDRS= rogue.h machdep.h config.h
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
34
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
35 OBJS1 = vers.$(O) armor.$(O) chase.$(O) command.$(O) daemon.$(O) daemons.$(O) \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
36 fight.$(O) init.$(O) io.$(O) list.$(O) main.$(O) mdport.$(O) \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
37 misc.$(O) monsters.$(O) move.$(O) newlevel.$(O) options.$(O)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
38 OBJS2 = pack.$(O) passages.$(O) potions.$(O) rings.$(O) rip.$(O) rooms.$(O) \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
39 save.$(O) scrolls.$(O) state.$(O) sticks.$(O) things.$(O) \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
40 weapons.$(O) wizard.$(O) xcrypt.$(O)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
41 OBJS = $(OBJS1) $(OBJS2)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
42
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
43 CFILES= vers.c armor.c chase.c command.c daemon.c daemons.c fight.c \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
44 init.c io.c list.c main.c mdport.c misc.c monsters.c move.c newlevel.c \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
45 options.c pack.c passages.c potions.c rings.c rip.c rooms.c \
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
46 save.c scrolls.c state.c sticks.c things.c weapons.c wizard.c xcrypt.c
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
47
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
48
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
49 MISC_C=
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
50 DOCSRC= rogue.6 rogue.r
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
51 DOCS = $(PROGRAM).doc $(PROGRAM).cat $(PROGRAM).html readme36.html
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
52 MISC = Makefile $(MISC_C) LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj $(DOCS)\
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
53 $(DOCSRC)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
54
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
55 CC = gcc
88
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents: 20
diff changeset
56 CPPFLAGS =@DEFS@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
57 ROPTS =
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
58 COPTS = -O3
20
bbf072f8bafa rogue3: move file locations from Makefile to machdep.h
edwarj4
parents: 16
diff changeset
59 CFLAGS= $(COPTS) $(ROPTS)
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
60 LIBS = -lcurses
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
61 RM = rm -f
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
62 LD = $(CC)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
63 LDOUT = -o
91
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
64 INSTALL=@INSTALL@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
65
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
66 .SUFFIXES: .obj
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
67
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
68 .c.obj:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
69 $(CC) $(CFLAGS) /c $*.c
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
70
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
71 $(PROGRAM)$(EXE): $(HDRS) $(OBJS)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
72 $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(LDOUT)$@
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
73
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
74 clean:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
75 $(RM) $(OBJS1)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
76 $(RM) $(OBJS2)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
77 $(RM) core $(PROGRAM) $(PROGRAM).exe $(DISTNAME).tar $(DISTNAME).tar.gz
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
78 $(RM) $(DISTNAME).zip
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
79
91
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
80 install: $(PROGRAM)
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
81 -touch test
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
82 -if test ! -f $(DESTDIR)$(SCOREFILE) ; \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
83 then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
84 -if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
85 $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
86 -if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
87 mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
88 -$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
89 -if test "x$(GROUPOWNER)" != "x" ; then \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
90 chgrp $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
91 chgrp $(GROUPOWNER) $(DESTDIR)$(LOGFILE) ; \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
92 chgrp $(GROUPOWNER) $(DESTDIR)$(bindir)/$(PROGRAM) ; \
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
93 chgrp $(GROUPOWNER) $(DESTDIR)$(SAVEDIR) ; \