annotate rogue3/Makefile.in @ 296:000b1c5b8d63

UltraRogue: fix inventory collision after save and restore. Inventory letters are based on "identifiers" stored in objects' o_ident field. Identifiers are allocated by get_ident(), which keeps a list of objects that have them, to avoid giving the same identifier to multiple objects. The list is not stored in the savefile, so after restore, get_ident() was not aware of existing identifiers. This resulted in picked-up objects having the same inventory letters as objects restored from the file. The restore code now adds all objects with identifiers to the list.
author John "Elwin" Edwards
date Mon, 15 Jan 2018 20:20:35 -0500
parents fe6b7a1a6dfc
children
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
287
0b3d1b38998f Remove version numbers from docdir paths.
John "Elwin" Edwards
parents: 232
diff changeset
12 DISTNAME=@PACKAGE_TARNAME@-@PACKAGE_VERSION@
0b3d1b38998f Remove version numbers from docdir paths.
John "Elwin" Edwards
parents: 232
diff changeset
13 PACKAGE_TARNAME=@PACKAGE_TARNAME@
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
223
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
51 DOCS = $(PROGRAM).doc $(PROGRAM).cat
224
4d0f53998e8a Makefile fixes related to installation.
John "Elwin" Edwards
parents: 223
diff changeset
52 RAWDOCS = LICENSE.TXT rogue36.html readme36.html
4d0f53998e8a Makefile fixes related to installation.
John "Elwin" Edwards
parents: 223
diff changeset
53 MISC = Makefile $(MISC_C) $(PROGRAM).sln $(PROGRAM).vcproj $(RAWDOCS) $(DOCS)\
4d0f53998e8a Makefile fixes related to installation.
John "Elwin" Edwards
parents: 223
diff changeset
54 $(DOCSRC)
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
55
231
455464db5800 Don't force the use of GCC.
John "Elwin" Edwards
parents: 224
diff changeset
56 CC = @CC@
88
07c4d4883ef2 rogue3: begin porting to autoconf.
John "Elwin" Edwards
parents: 20
diff changeset
57 CPPFLAGS =@DEFS@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
58 ROPTS =
116
97f8fdf9595c Makefiles: don't set defaults for CFLAGS.
John "Elwin" Edwards
parents: 92
diff changeset
59 COPTS =
20
bbf072f8bafa rogue3: move file locations from Makefile to machdep.h
edwarj4
parents: 16
diff changeset
60 CFLAGS= $(COPTS) $(ROPTS)
222
a666e4a034ed Fix curses library detection.
John "Elwin" Edwards
parents: 116
diff changeset
61 LIBS = @LIBS@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
62 RM = rm -f
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
63 LD = $(CC)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
64 LDOUT = -o
91
e5ddbaf324d4 rogue3: add install and uninstall targets to Makefile.
John "Elwin" Edwards
parents: 88
diff changeset
65 INSTALL=@INSTALL@
223
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
66 GROFF=@GROFF@
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
67 NROFF=@NROFF@
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
68 COLCRT=@COLCRT@
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
69 TBL=@TBL@
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
70
232
bac2c81fec78 Makefiles: don't rely on built-in implicit rules.
John "Elwin" Edwards
parents: 231
diff changeset
71 .SUFFIXES: .obj .o .c
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
72
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
73 .c.obj:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
74 $(CC) $(CFLAGS) /c $*.c
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
75
232
bac2c81fec78 Makefiles: don't rely on built-in implicit rules.
John "Elwin" Edwards
parents: 231
diff changeset
76 .c.o:
bac2c81fec78 Makefiles: don't rely on built-in implicit rules.
John "Elwin" Edwards
parents: 231
diff changeset
77 $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $*.o $*.c
bac2c81fec78 Makefiles: don't rely on built-in implicit rules.
John "Elwin" Edwards
parents: 231
diff changeset
78
223
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
79 all: $(PROGRAM)$(EXE) docs
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
80
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
81 $(PROGRAM)$(EXE): $(HDRS) $(OBJS)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
82 $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(LDOUT)$@
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
83
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
84 clean:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
85 $(RM) $(OBJS1)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
86 $(RM) $(OBJS2)
223
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
87 $(RM) core $(PROGRAM) $(PROGRAM).exe $(DOCS) $(DISTNAME).tar $(DISTNAME).tar.gz
0
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
88 $(RM) $(DISTNAME).zip
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490)
edwarj4
parents:
diff changeset
89
223
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff changeset
90 docs: $(DOCS)
0e99eade579c Generate text documentation from the troff source files.
John "Elwin" Edwards
parents: 222
diff