Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
Pull to resync.
This commit is contained in:
karnov
@@ -895,7 +895,7 @@ union yyalloc
|
||||
/* YYFINAL -- State number of the termination state. */
|
||||
#define YYFINAL 9
|
||||
/* YYLAST -- Last index in YYTABLE. */
|
||||
#define YYLAST 1031
|
||||
#define YYLAST 1033
|
||||
|
||||
/* YYNTOKENS -- Number of terminals. */
|
||||
#define YYNTOKENS 194
|
||||
@@ -1176,9 +1176,9 @@ static const yytype_int16 yypact[] =
|
||||
-654, 309, 387, 555, 556, 558, 733, 733, -654, -654,
|
||||
66, -31, 671, 46, 698, 571, 567, 672, 573, 66,
|
||||
215, 700, 566, 581, 66, 587, 359, 589, 66, 359,
|
||||
-18, -18, 672, 663, 664, -654, -654, 541, 544, 521,
|
||||
-654, -18, -18, 307, -654, 595, 590, 672, 597, 66,
|
||||
67, 186, 659, 730, 604, 669, -1, 8, -654, 606,
|
||||
-18, -18, 672, 663, 664, -654, -654, 592, 593, 521,
|
||||
-654, -18, -18, 307, -654, 598, 596, 672, 597, 66,
|
||||
67, 186, 660, 730, 604, 669, -1, 8, -654, 606,
|
||||
607, -1, -1, -1, 66, 609, 89, -18, 141, 12,
|
||||
57, 665, -654, 52, 52, -654, 156, 605, -38, 697,
|
||||
-654, -654, 331, 347, 168, 168, -654, -654, -654, 56,
|
||||
@@ -1339,9 +1339,9 @@ static const yytype_int16 yypgoto[] =
|
||||
-654, -654, -654, -654, -654, -654, -654, -654, -654, -654,
|
||||
-654, -654, -654, -654, -654, -654, -654, 421, -653, 200,
|
||||
-654, -385, -492, -654, -654, -654, 369, 682, -168, -136,
|
||||
-312, 583, 150, -308, -386, -485, -418, -473, 596, -459,
|
||||
-132, -55, -654, 396, -654, -654, 610, -654, -654, 781,
|
||||
-135, 576, -392, -654, -654, -654, -654, -654, -124, -654
|
||||
-312, 583, 150, -308, -386, -485, -418, -473, 602, -459,
|
||||
-132, -55, -654, 396, -654, -654, 610, -654, -654, 778,
|
||||
-135, 575, -392, -654, -654, -654, -654, -654, -124, -654
|
||||
};
|
||||
|
||||
/* YYDEFGOTO[NTERM-NUM]. */
|
||||
@@ -1442,8 +1442,8 @@ static const yytype_int16 yytable[] =
|
||||
433, 719, 720, 721, 722, 723, 724, 725, 726, 727,
|
||||
728, 442, 443, 444, 446, 451, 452, 310, 311, 312,
|
||||
313, 314, 453, 310, 311, 312, 313, 314, 455, 857,
|
||||
457, 463, 464, 480, 481, 864, 493, 465, 483, 819,
|
||||
466, 202, 203, 193, 494, 495, 496, 501, 502, 16,
|
||||
457, 463, 464, 465, 466, 864, 480, 493, 483, 819,
|
||||
481, 202, 203, 193, 494, 495, 496, 501, 502, 16,
|
||||
507, 526, -159, 537, 194, 195, 554, 17, 845, 552,
|
||||
18, 19, 20, 21, 22, 23, 24, 25, 26, 555,
|
||||
557, 853, 27, 28, 29, 558, 561, 586, 30, 31,
|
||||
@@ -1472,8 +1472,8 @@ static const yytype_int16 yytable[] =
|
||||
839, 840, 833, 841, 843, 846, 848, 850, 849, 10,
|
||||
851, 172, 855, 856, 434, 861, 863, 339, 166, 865,
|
||||
508, 807, 560, 292, 796, 802, 753, 299, 826, 222,
|
||||
847, 838, 731, 437, 668, 698, 556, 547, 0, 535,
|
||||
374, 581
|
||||
847, 838, 731, 437, 668, 698, 556, 374, 0, 535,
|
||||
581, 0, 0, 547
|
||||
};
|
||||
|
||||
static const yytype_int16 yycheck[] =
|
||||
@@ -1550,8 +1550,8 @@ static const yytype_int16 yycheck[] =
|
||||
132, 97, 98, 99, 100, 101, 102, 103, 104, 105,
|
||||
106, 3, 131, 136, 131, 5, 140, 185, 186, 187,
|
||||
188, 189, 131, 185, 186, 187, 188, 189, 131, 855,
|
||||
131, 58, 58, 128, 134, 861, 67, 186, 131, 784,
|
||||
186, 59, 60, 139, 4, 131, 67, 131, 131, 6,
|
||||
131, 58, 58, 131, 131, 861, 128, 67, 131, 784,
|
||||
134, 59, 60, 139, 4, 131, 67, 131, 131, 6,
|
||||
131, 136, 77, 131, 150, 151, 3, 14, 831, 138,
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 131,
|
||||
134, 844, 29, 30, 31, 4, 139, 131, 35, 36,
|
||||
@@ -1580,8 +1580,8 @@ static const yytype_int16 yycheck[] =
|
||||
4, 134, 192, 134, 134, 131, 134, 134, 129, 5,
|
||||
134, 55, 131, 131, 336, 131, 860, 192, 49, 134,
|
||||
396, 767, 450, 164, 754, 762, 678, 169, 795, 139,
|
||||
833, 821, 653, 341, 603, 629, 443, 431, -1, 419,
|
||||
249, 455
|
||||
833, 821, 653, 341, 603, 629, 443, 249, -1, 419,
|
||||
455, -1, -1, 431
|
||||
};
|
||||
|
||||
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
|
||||
@@ -1634,7 +1634,7 @@ static const yytype_uint16 yystos[] =
|
||||
335, 132, 132, 132, 209, 207, 335, 321, 3, 3,
|
||||
133, 297, 3, 131, 136, 344, 131, 335, 64, 65,
|
||||
271, 5, 140, 131, 335, 131, 208, 131, 335, 208,
|
||||
323, 323, 344, 58, 58, 186, 186, 58, 267, 344,
|
||||
323, 323, 344, 58, 58, 131, 131, 58, 267, 344,
|
||||
323, 323, 3, 7, 133, 158, 159, 328, 329, 344,
|
||||
128, 134, 344, 131, 335, 55, 59, 316, 59, 61,
|
||||
62, 317, 320, 67, 4, 131, 67, 352, 59, 133,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Makefile for NetHack's utility programs.
|
||||
# NetHack 3.5 Makefile.utl $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
|
||||
# NetHack 3.5 Makefile.utl $NHDT-Date: 1430639195 2015/05/03 07:46:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.19 $
|
||||
# NetHack 3.5 Makefile.utl $Date: 2012/01/10 17:47:30 $ $Revision: 1.18 $
|
||||
|
||||
# Root of source tree:
|
||||
@@ -325,8 +325,13 @@ xpm2img.ttp: xpm2img.o bitmfile.o
|
||||
tile2beos: tile2beos.o $(TEXT_IO)
|
||||
$(CC) $(LFLAGS) -o tile2beos tile2beos.o $(TEXT_IO) -lbe
|
||||
|
||||
tilemap: ../win/share/tilemap.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) $(LFLAGS) -o tilemap ../win/share/tilemap.c $(LIBS)
|
||||
#--compiling and linking in one step leaves extra debugging files (in their
|
||||
# own subdirectories!) on OSX; compile and link separately to suppress
|
||||
# that without mucking about with extra OS-specific CFLAGS and/or LFLAGS
|
||||
#tilemap: ../win/share/tilemap.c $(HACK_H)
|
||||
# $(CC) $(CFLAGS) $(LFLAGS) -o tilemap ../win/share/tilemap.c $(LIBS)
|
||||
tilemap: tilemap.o
|
||||
$(CC) $(LFLAGS) -o tilemap tilemap.o $(LIBS)
|
||||
../src/tile.c: tilemap
|
||||
./tilemap
|
||||
|
||||
@@ -334,9 +339,17 @@ tilemap: ../win/share/tilemap.c $(HACK_H)
|
||||
cp ../win/share/tile.h ../include/tile.h
|
||||
tiletext.o: ../win/share/tiletext.c $(CONFIG_H) ../include/tile.h
|
||||
$(CC) $(CFLAGS) -c ../win/share/tiletext.c
|
||||
tiletxt.o: ../win/share/tilemap.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) -c -DTILETEXT ../win/share/tilemap.c
|
||||
mv tilemap.o tiletxt.o
|
||||
tiletxt.c: ./Makefile
|
||||
echo '/* alternate compilation for tilemap.c to create tiletxt.o' > tiletxt.c
|
||||
echo ' that does not rely on "cc -c -o tiletxt.o tilemap.c"' >> tiletxt.c
|
||||
echo ' since many pre-POSIX compilers did not support that */' >> tiletxt.c
|
||||
echo '#define TILETEXT' >> tiletxt.c
|
||||
echo '#include "../win/share/tilemap.c"' >> tiletxt.c
|
||||
echo '/*tiletxt.c*/' >> tiletxt.c
|
||||
tiletxt.o: tiletxt.c ../win/share/tilemap.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) -c tiletxt.c
|
||||
tilemap.o: ../win/share/tilemap.c $(HACK_H)
|
||||
$(CC) $(CFLAGS) -c ../win/share/tilemap.c
|
||||
|
||||
gifread.o: ../win/share/gifread.c $(CONFIG_H) ../include/tile.h
|
||||
$(CC) $(CFLAGS) -c ../win/share/gifread.c
|
||||
@@ -402,7 +415,7 @@ clean:
|
||||
spotless: clean
|
||||
-rm -f lev_lex.c lev_yacc.c dgn_lex.c dgn_yacc.c
|
||||
-rm -f ../include/lev_comp.h ../include/dgn_comp.h
|
||||
-rm -f ../include/tile.h
|
||||
-rm -f ../include/tile.h tiletxt.c
|
||||
-rm -f makedefs lev_comp dgn_comp recover dlb
|
||||
-rm -f gif2txt txt2ppm tile2x11 tile2img.ttp xpm2img.ttp tilemap
|
||||
|
||||
|
||||
Reference in New Issue
Block a user