Skip to content

Commit

Permalink
Various build fixes.
Browse files Browse the repository at this point in the history
I'm not sure why this build supposedly worked before (or, more
likely, I fixed this issue in my local tree and then blew away
the tree), but strncmpi isn't available for the DS so we need to
not define STRNCMPI in the build.

While I was in here, I also cleaned things up a built to remove
some unnecessary code here and there.
  • Loading branch information
Brett Kosinski authored and Brett Kosinski committed Jul 29, 2018
1 parent 745b3ec commit af99360
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
1 change: 1 addition & 0 deletions include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
# undef QT_GRAPHICS
# undef GNOME_GRAPHICS
# undef MSWIN_GRAPHICS
# define NDS_GRAPHICS
# define DEFAULT_WINDOW_SYS "nds"
# define HACKDIR "/NetHack"
# define NDS_PACKED __attribute__((__packed__)) /* for sp_lev.h */
Expand Down
20 changes: 9 additions & 11 deletions include/config1.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,15 @@
* defined("") => (-1 != - "" - 1)
* [which is an unavoidable catastrophe.]
*/
#endif

/*
* NDS Autodetection
*/
#if defined(NDS) || defined(ARM7) || defined(ARM9)
# define NDS
# define NDS_GRAPHICS
# define NEED_VARARGS
# define USE_STDARGS
# define STRNCMPI
#endif

/*
* NDS Autodetection
*/
#if defined(NDS) || defined(ARM7) || defined(ARM9)
# define NDS
# define NEED_VARARGS
# define USE_STDARG
#endif

#endif /* CONFIG1_H */
3 changes: 0 additions & 3 deletions include/ndsconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@
#endif

#define NO_SIGNAL
#define NEED_VARARGS
#define USE_STDARG
#define PATHLEN BUFSZ /* maximum pathlength */
#define FILENAME BUFSZ /* maximum filename length (conservative) */
#define TRADITIONAL_GLYPHMAP /* Store glyph mappings at level change time */
#define PC_LOCKING /* Prevent overwrites of aborted or in-progress games */
/* without first receiving confirmation. */
#define SELF_RECOVER /* Allow the game itself to recover from an aborted game */
#define FCMASK 0660 /* file creation mask */
#define STRNCMPI
#define GCC_WARN
#define Rand() rand()
#define NEARDATA
Expand Down

0 comments on commit af99360

Please sign in to comment.