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

cherry-pick the YACC/LEX upgrades from elsewhere

Browse Source
This commit is contained in:
Derek S. Ray
2015-05-05 18:30:58 -04:00
parent f692db8581
commit be98bca06d
3 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engrave.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 engrave.c $NHDT-Date: 1429953062 2015/04/25 09:11:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.47 $ */ /* NetHack 3.5 engrave.c $NHDT-Date: 1430866579 2015/05/05 22:56:19 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.49 $ */
/* NetHack 3.5 engrave.c $Date: 2012/12/20 01:48:36 $ $Revision: 1.39 $ */ /* NetHack 3.5 engrave.c $Date: 2012/12/20 01:48:36 $ $Revision: 1.39 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -708,6 +708,8 @@ doengrave()
"Chips fly out from the headstone." : "Chips fly out from the headstone." :
is_ice(u.ux,u.uy) ? is_ice(u.ux,u.uy) ?
"Ice chips fly up from the ice surface!" : "Ice chips fly up from the ice surface!" :
(level.locations[u.ux][u.uy].typ == DRAWBRIDGE_DOWN) ?
"Splinters fly up from the bridge." :
"Gravel flies up from the floor."); "Gravel flies up from the floor.");
else else
Strcpy(post_engr_text, "You hear drilling!"); Strcpy(post_engr_text, "You hear drilling!");

42
win/win32/dgnstuff.mak
View File

@@ -1,27 +1,22 @@
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ # $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# $Date: 2002/01/22 22:54:54 $ $Revision: 1.3 $ # $Date: 2002/01/22 22:54:54 $ $Revision: 1.3 $
#Set all of these or none of them # Set all of these or none of them.
#YACC = byacc.exe #
#LEX = flex.exe # bison and flex are the ones found in GnuWin32, which
#YTABC = y_tab.c # is probably the easiest set of these tools to find
#YTABH = y_tab.h # on Windows.
#LEXYYC = lexyy.c #
#YACC = bison.exe -y
#LEX = flex.exe
#YTABC = y.tab.c
#YTABH = y.tab.h
#LEXYYC = lex.yy.c
!IF "$(YACC)"!=""
@echo Yacc-alike set to $(YACC)
@echo YTABC set to $(YTABC)
@echo YTABH set to $(YTABH)
!ENDIF
!IF "$(LEX)"!=""
@echo Lex-alike set to $(LEX)
@echo LEXYYC set to $(LEXYYC)
!ENDIF
default: all default: all
all: ..\util\dgn_yacc.c ..\util\dgn_lex.c all: tools ..\util\dgn_yacc.c ..\util\dgn_lex.c
rebuild: clean all rebuild: clean all
@@ -30,6 +25,19 @@ clean:
-del ..\util\dgn_yacc.c -del ..\util\dgn_yacc.c
-del ..\include\dgn_comp.h -del ..\include\dgn_comp.h
tools:
!IFDEF YACC
@echo Yacc-alike set to $(YACC)
@echo YTABC set to $(YTABC)
@echo YTABH set to $(YTABH)
!ENDIF
!IFDEF LEX
@echo Lex-alike set to $(LEX)
@echo LEXYYC set to $(LEXYYC)
!ENDIF
#========================================== #==========================================
# Dungeon Compiler Stuff # Dungeon Compiler Stuff
#========================================== #==========================================

30
win/win32/levstuff.mak
View File

@@ -1,26 +1,18 @@
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ # $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# $Date:2002/01/22 22:54:54 $ $Revision: 1.2 $ # $Date:2002/01/22 22:54:54 $ $Revision: 1.2 $
#YACC = byacc.exe
#LEX = flex.exe
#YTABC = y_tab.c
#YTABH = y_tab.h
#LEXYYC = lexyy.c
!IF "$(YACC)"!="" # Set all of these or none of them.
@echo Yacc-alike set to $(YACC) #
@echo YTABC set to $(YTABC) # bison and flex are the ones found in GnuWin32, which
@echo YTABH set to $(YTABH) # is probably the easiest set of these tools to find
!ENDIF # on Windows.
#
#YACC = bison.exe -y
#LEX = flex.exe
#YTABC = y.tab.c
#YTABH = y.tab.h
#LEXYYC = lex.yy.c
!IF "$(LEX)"!=""
@echo Lex-alike set to $(LEX)
@echo LEXYYC set to $(LEXYYC)
!ENDIF
# these won't have an impact unless YACC/LEX are defined
YTABC = y.tab.c
YTABH = y.tab.h
LEXYYC = lex.yy.c
default: all default: all