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

some build fix-ups

Browse Source
This commit is contained in:
nhmall
2019-11-06 13:43:27 -05:00
parent ee260b558f
commit 223c31af0c
5 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+4 -4
View File
@@ -148,7 +148,7 @@ static int NDECL(wiz_where);
static int NDECL(wiz_detect); static int NDECL(wiz_detect);
static int NDECL(wiz_panic); static int NDECL(wiz_panic);
static int NDECL(wiz_polyself); static int NDECL(wiz_polyself);
STATIC_PTR int NDECL(wiz_load_lua); static int NDECL(wiz_load_lua);
static int NDECL(wiz_level_tele); static int NDECL(wiz_level_tele);
static int NDECL(wiz_level_change); static int NDECL(wiz_level_change);
static int NDECL(wiz_show_seenv); static int NDECL(wiz_show_seenv);
@@ -874,7 +874,7 @@ boolean pre, wiztower;
} }
/* #wizmakemap - discard current dungeon level and replace with a new one */ /* #wizmakemap - discard current dungeon level and replace with a new one */
STATIC_PTR int static int
wiz_makemap(VOID_ARGS) wiz_makemap(VOID_ARGS)
{ {
if (wizard) { if (wizard) {
@@ -945,7 +945,7 @@ wiz_detect(VOID_ARGS)
return 0; return 0;
} }
STATIC_PTR int static int
wiz_load_lua(VOID_ARGS) wiz_load_lua(VOID_ARGS)
{ {
if (wizard) { if (wizard) {
@@ -961,7 +961,7 @@ wiz_load_lua(VOID_ARGS)
return 0; return 0;
} }
STATIC_PTR int static int
wiz_load_splua(VOID_ARGS) wiz_load_splua(VOID_ARGS)
{ {
if (wizard) { if (wizard) {
src/mklev.c
+1 -1
View File
@@ -14,7 +14,7 @@ static void FDECL(mksink, (struct mkroom *));
static void FDECL(mkaltar, (struct mkroom *)); static void FDECL(mkaltar, (struct mkroom *));
static void FDECL(mkgrave, (struct mkroom *)); static void FDECL(mkgrave, (struct mkroom *));
static void NDECL(makevtele); static void NDECL(makevtele);
static void NDECL(clear_level_structures); void NDECL(clear_level_structures);
static void NDECL(makelevel); static void NDECL(makelevel);
static boolean FDECL(bydoor, (XCHAR_P, XCHAR_P)); static boolean FDECL(bydoor, (XCHAR_P, XCHAR_P));
static struct mkroom *FDECL(find_branch_room, (coord *)); static struct mkroom *FDECL(find_branch_room, (coord *));
src/nhlsel.c
+28 -28
View File
@@ -6,34 +6,34 @@
#include "sp_lev.h" #include "sp_lev.h"
/* lua_CFunction prototypes */ /* lua_CFunction prototypes */
STATIC_DCL int FDECL(l_selection_new, (lua_State *)); static int FDECL(l_selection_new, (lua_State *));
STATIC_DCL int FDECL(l_selection_clone, (lua_State *)); static int FDECL(l_selection_clone, (lua_State *));
STATIC_DCL int FDECL(l_selection_getpoint, (lua_State *)); static int FDECL(l_selection_getpoint, (lua_State *));
STATIC_DCL int FDECL(l_selection_setpoint, (lua_State *)); static int FDECL(l_selection_setpoint, (lua_State *));
STATIC_DCL int FDECL(l_selection_not, (lua_State *)); static int FDECL(l_selection_not, (lua_State *));
STATIC_DCL int FDECL(l_selection_filter_percent, (lua_State *)); static int FDECL(l_selection_filter_percent, (lua_State *));
STATIC_DCL int FDECL(l_selection_rndcoord, (lua_State *)); static int FDECL(l_selection_rndcoord, (lua_State *));
STATIC_DCL int FDECL(l_selection_line, (lua_State *)); static int FDECL(l_selection_line, (lua_State *));
STATIC_DCL int FDECL(l_selection_randline, (lua_State *)); static int FDECL(l_selection_randline, (lua_State *));
STATIC_DCL int FDECL(l_selection_rect, (lua_State *)); static int FDECL(l_selection_rect, (lua_State *));
STATIC_DCL int FDECL(l_selection_fillrect, (lua_State *)); static int FDECL(l_selection_fillrect, (lua_State *));
STATIC_DCL int FDECL(l_selection_fillrect, (lua_State *)); static int FDECL(l_selection_fillrect, (lua_State *));
STATIC_DCL int FDECL(l_selection_grow, (lua_State *)); static int FDECL(l_selection_grow, (lua_State *));
STATIC_DCL int FDECL(l_selection_filter_mapchar, (lua_State *)); static int FDECL(l_selection_filter_mapchar, (lua_State *));
STATIC_DCL int FDECL(l_selection_flood, (lua_State *)); static int FDECL(l_selection_flood, (lua_State *));
STATIC_DCL int FDECL(l_selection_circle, (lua_State *)); static int FDECL(l_selection_circle, (lua_State *));
STATIC_DCL int FDECL(l_selection_ellipse, (lua_State *)); static int FDECL(l_selection_ellipse, (lua_State *));
STATIC_DCL int FDECL(l_selection_gradient, (lua_State *)); static int FDECL(l_selection_gradient, (lua_State *));
STATIC_DCL int FDECL(l_selection_iterate, (lua_State *)); static int FDECL(l_selection_iterate, (lua_State *));
STATIC_DCL int FDECL(l_selection_gc, (lua_State *)); static int FDECL(l_selection_gc, (lua_State *));
STATIC_DCL int FDECL(l_selection_not, (lua_State *)); static int FDECL(l_selection_not, (lua_State *));
STATIC_DCL int FDECL(l_selection_and, (lua_State *)); static int FDECL(l_selection_and, (lua_State *));
STATIC_DCL int FDECL(l_selection_or, (lua_State *)); static int FDECL(l_selection_or, (lua_State *));
STATIC_DCL int FDECL(l_selection_xor, (lua_State *)); static int FDECL(l_selection_xor, (lua_State *));
STATIC_DCL int FDECL(l_selection_not, (lua_State *)); static int FDECL(l_selection_not, (lua_State *));
STATIC_DCL int FDECL(l_selection_add, (lua_State *)); static int FDECL(l_selection_add, (lua_State *));
STATIC_DCL int FDECL(l_selection_sub, (lua_State *)); static int FDECL(l_selection_sub, (lua_State *));
STATIC_DCL int FDECL(l_selection_ipairs, (lua_State *)); static int FDECL(l_selection_ipairs, (lua_State *));
struct selectionvar * struct selectionvar *
l_selection_check(L, index) l_selection_check(L, index)
src/nhlua.c
+15 -15
View File
@@ -14,21 +14,21 @@
/* */ /* */
/* lua_CFunction prototypes */ /* lua_CFunction prototypes */
STATIC_DCL int FDECL(nhl_test, (lua_State *)); static int FDECL(nhl_test, (lua_State *));
STATIC_DCL int FDECL(nhl_getmap, (lua_State *)); static int FDECL(nhl_getmap, (lua_State *));
STATIC_DCL int FDECL(nhl_setmap, (lua_State *)); static int FDECL(nhl_setmap, (lua_State *));
STATIC_DCL int FDECL(nhl_pline, (lua_State *)); static int FDECL(nhl_pline, (lua_State *));
STATIC_DCL int FDECL(nhl_verbalize, (lua_State *)); static int FDECL(nhl_verbalize, (lua_State *));
STATIC_DCL int FDECL(nhl_menu, (lua_State *)); static int FDECL(nhl_menu, (lua_State *));
STATIC_DCL int FDECL(nhl_getlin, (lua_State *)); static int FDECL(nhl_getlin, (lua_State *));
STATIC_DCL int FDECL(nhl_makeplural, (lua_State *)); static int FDECL(nhl_makeplural, (lua_State *));
STATIC_DCL int FDECL(nhl_makesingular, (lua_State *)); static int FDECL(nhl_makesingular, (lua_State *));
STATIC_DCL int FDECL(nhl_s_suffix, (lua_State *)); static int FDECL(nhl_s_suffix, (lua_State *));
STATIC_DCL int FDECL(nhl_ing_suffix, (lua_State *)); static int FDECL(nhl_ing_suffix, (lua_State *));
STATIC_DCL int FDECL(nhl_an, (lua_State *)); static int FDECL(nhl_an, (lua_State *));
STATIC_DCL int FDECL(nhl_meta_u_index, (lua_State *)); static int FDECL(nhl_meta_u_index, (lua_State *));
STATIC_DCL int FDECL(nhl_meta_u_newindex, (lua_State *)); static int FDECL(nhl_meta_u_newindex, (lua_State *));
STATIC_DCL int FDECL(traceback_handler, (lua_State *)); static int FDECL(traceback_handler, (lua_State *));
void void
nhl_error(L, msg) nhl_error(L, msg)
sys/winnt/Makefile.msc
+23 -13
View File
@@ -892,8 +892,8 @@ $(GAMEDIR)\nhraykey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def
/PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).map" /DEF:$(O)$(@B).def \ /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).map" /DEF:$(O)$(@B).def \
/IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o
$(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\oracles \
$(DAT)\oracles $(DAT)\quest.dat $(O)sp_lev.tag $(DLB) $(DAT)\quest.dat $(O)sp_lev.tag $(DLB)
! IF ("$(USE_DLB)"=="Y") ! IF ("$(USE_DLB)"=="Y")
copy nhdat$(NHV) $(GAMEDIR) copy nhdat$(NHV) $(GAMEDIR)
copy $(DAT)\license $(GAMEDIR) copy $(DAT)\license $(GAMEDIR)
@@ -903,7 +903,7 @@ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
copy $(DAT)\*.dat $(GAMEDIR) copy $(DAT)\*.dat $(GAMEDIR)
if exist $(GAMEDIR)\makefile del $(GAMEDIR)\makefile if exist $(GAMEDIR)\makefile del $(GAMEDIR)\makefile
! ENDIF ! ENDIF
if exist $(MSWSYS)\sysconf.template copy $(MSWSYS)\sysconf.temnplate $(GAMEDIR) if exist $(MSWSYS)\sysconf.template copy $(MSWSYS)\sysconf.template $(GAMEDIR)
if exist $(DAT)\symbols copy $(DAT)\symbols $(GAMEDIR)\symbols.template if exist $(DAT)\symbols copy $(DAT)\symbols $(GAMEDIR)\symbols.template
if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt
if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
@@ -961,8 +961,7 @@ $(O)sp_lev.tag:
!ENDIF !ENDIF
$(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \ $(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
$(SRC)\vis_tab.c $(INCL)\vis_tab.h \ $(SRC)\vis_tab.c $(INCL)\vis_tab.h $(TILEUTIL16)
$(U)dgncomp.exe $(TILEUTIL16)
@echo utilities made >$@ @echo utilities made >$@
@echo utilities made. @echo utilities made.
@@ -1117,6 +1116,7 @@ $(U)levcomp.exe: $(LEVCOMPOBJS)
# Dungeon Compiler Stuff # Dungeon Compiler Stuff
#================================================= #=================================================
# #
!IFDEF OBSOLETE_DGN_COMPILER
# defer to the steps in ..\win\win32\dgnstuff.mak # defer to the steps in ..\win\win32\dgnstuff.mak
# #
$(U)dgn_yacc.c: $(U)dgn_comp.y $(U)dgn_yacc.c: $(U)dgn_comp.y
@@ -1144,7 +1144,7 @@ $(U)dgncomp.exe: $(DGNCOMPOBJS)
$(DGNCOMPOBJS:^ =^ $(DGNCOMPOBJS:^ =^
) )
<< <<
!ENDIF
#================================================= #=================================================
# Create directory for holding object files # Create directory for holding object files
@@ -1207,7 +1207,7 @@ $(DAT)\porthelp: $(MSWSYS)\porthelp
nhdat$(NHV): $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \ nhdat$(NHV): $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
$(DAT)\quest.dat $(DAT)\rumors $(DAT)\help $(DAT)\hh $(DAT)\cmdhelp $(DAT)\keyhelp \ $(DAT)\quest.dat $(DAT)\rumors $(DAT)\help $(DAT)\hh $(DAT)\cmdhelp $(DAT)\keyhelp \
$(DAT)\history $(DAT)\opthelp $(DAT)\wizhelp $(DAT)\dungeon $(DAT)\porthelp \ $(DAT)\history $(DAT)\opthelp $(DAT)\wizhelp $(DAT)\porthelp \
$(DAT)\license $(DAT)\engrave $(DAT)\epitaph $(DAT)\bogusmon $(DAT)\tribute $(O)sp_lev.tag $(DAT)\license $(DAT)\engrave $(DAT)\epitaph $(DAT)\bogusmon $(DAT)\tribute $(O)sp_lev.tag
cd $(DAT) cd $(DAT)
echo data >dlb.lst echo data >dlb.lst
@@ -1225,7 +1225,9 @@ nhdat$(NHV): $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
echo history >>dlb.lst echo history >>dlb.lst
echo opthelp >>dlb.lst echo opthelp >>dlb.lst
echo wizhelp >>dlb.lst echo wizhelp >>dlb.lst
!IFDEF OBSOLETE_DGN_COMPILER
echo dungeon >>dlb.lst echo dungeon >>dlb.lst
!ENDIF
echo license >>dlb.lst echo license >>dlb.lst
echo engrave >>dlb.lst echo engrave >>dlb.lst
echo epitaph >>dlb.lst echo epitaph >>dlb.lst
@@ -1432,8 +1434,10 @@ spotless: clean
if exist $(DAT)\ttyoptions del $(DAT)\ttyoptions if exist $(DAT)\ttyoptions del $(DAT)\ttyoptions
if exist $(DAT)\guioptions del $(DAT)\guioptions if exist $(DAT)\guioptions del $(DAT)\guioptions
if exist $(DAT)\data del $(DAT)\data if exist $(DAT)\data del $(DAT)\data
!IFDEF OBSOLETE_DGN_COMPILER
if exist $(DAT)\dungeon del $(DAT)\dungeon if exist $(DAT)\dungeon del $(DAT)\dungeon
if exist $(DAT)\dungeon.pdf del $(DAT)\dungeon.pdf if exist $(DAT)\dungeon.pdf del $(DAT)\dungeon.pdf
!ENDIF
!IFDEF OBSOLETE_LEVEL_COMPILER !IFDEF OBSOLETE_LEVEL_COMPILER
if exist $(DAT)\???-fil?.lev del $(DAT)\???-fil?.lev if exist $(DAT)\???-fil?.lev del $(DAT)\???-fil?.lev
if exist $(DAT)\???-goal.lev del $(DAT)\???-goal.lev if exist $(DAT)\???-goal.lev del $(DAT)\???-goal.lev
@@ -1467,21 +1471,21 @@ clean:
if exist $(U)makedefs.exe del $(U)makedefs.exe if exist $(U)makedefs.exe del $(U)makedefs.exe
!IFDEF OBSOLETE_LEVEL_COMPILER !IFDEF OBSOLETE_LEVEL_COMPILER
if exist $(U)levcomp.exe del $(U)levcomp.exe if exist $(U)levcomp.exe del $(U)levcomp.exe
if exist $(O)levcomp.MAP del $(O)levcomp.MAP
if exist $(O)levcomp.PDB del $(O)levcomp.PDB
!ENDIF !ENDIF
!IFDEF OBSOLETE_DGN_COMPILER
if exist $(U)dgncomp.exe del $(U)dgncomp.exe if exist $(U)dgncomp.exe del $(U)dgncomp.exe
if exist $(O)dgncomp.MAP del $(O)dgncomp.MAP
if exist $(O)dgncomp.PDB del $(O)dgncomp.PDB
!ENDIF
if exist $(SRC)\*.lnk del $(SRC)\*.lnk if exist $(SRC)\*.lnk del $(SRC)\*.lnk
if exist $(SRC)\*.map del $(SRC)\*.map if exist $(SRC)\*.map del $(SRC)\*.map
if exist $(O)install.tag del $(O)install.tag if exist $(O)install.tag del $(O)install.tag
if exist $(O)console.res del $(O)console.res if exist $(O)console.res del $(O)console.res
if exist $(O)dgncomp.MAP del $(O)dgncomp.MAP
if exist $(O)dgncomp.PDB del $(O)dgncomp.PDB
if exist $(O)dlb_main.MAP del $(O)dlb_main.MAP if exist $(O)dlb_main.MAP del $(O)dlb_main.MAP
if exist $(O)dlb_main.PDB del $(O)dlb_main.PDB if exist $(O)dlb_main.PDB del $(O)dlb_main.PDB
if exist $(O)gamedir.tag del $(O)gamedir.tag if exist $(O)gamedir.tag del $(O)gamedir.tag
!IFDEF OBSOLETE_LEVEL_COMPILER
if exist $(O)levcomp.MAP del $(O)levcomp.MAP
if exist $(O)levcomp.PDB del $(O)levcomp.PDB
!ENDIF
if exist $(O)makedefs.MAP del $(O)makedefs.MAP if exist $(O)makedefs.MAP del $(O)makedefs.MAP
if exist $(O)makedefs.PDB del $(O)makedefs.PDB if exist $(O)makedefs.PDB del $(O)makedefs.PDB
if exist $(O)NetHack.MAP del $(O)NetHack.MAP if exist $(O)NetHack.MAP del $(O)NetHack.MAP
@@ -1505,14 +1509,18 @@ clean:
if exist $(O)sp_lev.tag del $(O)sp_lev.tag if exist $(O)sp_lev.tag del $(O)sp_lev.tag
if exist $(O)uudecode.MAP del $(O)uudecode.MAP if exist $(O)uudecode.MAP del $(O)uudecode.MAP
if exist $(O)uudecode.PDB del $(O)uudecode.PDB if exist $(O)uudecode.PDB del $(O)uudecode.PDB
!IFDEF OBSOLETE_LEVEL_COMPILER
rem rem
rem defer to the steps in ..\win\win32\levstuff.mak rem defer to the steps in ..\win\win32\levstuff.mak
rem rem
nmake -nologo -f ..\win\win32\levstuff.mak clean nmake -nologo -f ..\win\win32\levstuff.mak clean
!ENDIF
!IFDEF OBSOLETE_DGN_COMPILER
rem rem
rem defer to the steps in ..\win\win32\dgnstuff.mak rem defer to the steps in ..\win\win32\dgnstuff.mak
rem rem
nmake -nologo -f ..\win\win32\dgnstuff.mak clean nmake -nologo -f ..\win\win32\dgnstuff.mak clean
!ENDIF
if exist $(TILEBMP16) del $(TILEBMP16) if exist $(TILEBMP16) del $(TILEBMP16)
if exist $(TILEBMP32) del $(TILEBMP32) if exist $(TILEBMP32) del $(TILEBMP32)
@@ -1545,11 +1553,13 @@ $(DAT)\epitaph: $(DAT)\epitaph.txt $(U)makedefs.exe
$(DAT)\bogusmon: $(DAT)\bogusmon.txt $(U)makedefs.exe $(DAT)\bogusmon: $(DAT)\bogusmon.txt $(U)makedefs.exe
$(U)makedefs -s $(U)makedefs -s
!IFDEF OBSOLETE_DGN_COMPILER
$(DAT)\dungeon: $(O)utility.tag $(DAT)\dungeon.def $(DAT)\dungeon: $(O)utility.tag $(DAT)\dungeon.def
$(U)makedefs -e $(U)makedefs -e
cd $(DAT) cd $(DAT)
$(U)dgncomp dungeon.pdf $(U)dgncomp dungeon.pdf
cd $(SRC) cd $(SRC)
!ENDIF
# #
# NT dependencies # NT dependencies