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

'make depend' fix

Browse Source 
The gone but still referenced state of amiconf.h broke 'make depend'.
Fixing that turns it into a comment in the generated dependencies
but that ran into a problem with it being followed by fnamesiz.h
instead of being last in the list containing it.  So in addition to
the depend fix, move #include "fnamesiz.h" from config.h to global.h
in order to have it come before amiconf.h.
This commit is contained in:
PatR
2021-01-08 13:33:27 -08:00
parent c2989be3fc
commit 129ff12245
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 config.h $NHDT-Date: 1608933417 2020/12/25 21:56:57 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.146 $ */
/* NetHack 3.7 config.h $NHDT-Date: 1610141601 2021/01/08 21:33:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.148 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2016. */
/* NetHack may be freely redistributed. See license for details. */
@@ -608,6 +608,5 @@ typedef unsigned char uchar;
#endif
#include "global.h" /* Define everything else according to choices above */
#include "fnamesiz.h" /* Define file sizes shared between nethack and recover */
#endif /* CONFIG_H */

4
include/global.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 global.h $NHDT-Date: 1594032649 2020/07/06 10:50:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.104 $ */
/* NetHack 3.7 global.h $NHDT-Date: 1610141601 2021/01/08 21:33:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */
@@ -110,6 +110,8 @@ typedef uchar nhsym;
#include "coord.h"
#include "fnamesiz.h" /* file sizes shared between nethack and recover */
#if defined(CROSSCOMPILE)
struct cross_target_s {
const char *build_date;