Merge branch 'crosscompile-integration-amiga' into NetHack-3.7

include/dlb.h

@@ -9,7 +9,7 @@
 #ifdef DLB
 
 /* implementations */
-#ifdef MAC
+#if defined(MAC) && !defined(MAC_CROSS)
 #define DLBRSRC /* use Mac resources */
 #else
 #define DLBLIB /* use a set of external files */

include/extern.h

@@ -2149,10 +2149,12 @@ E void NDECL(deliver_splev_message);
 /* ### random.c ### */
 
 #if defined(RANDOM) && !defined(__GO32__) /* djgpp has its own random */
+#ifndef AMIGA_CROSS
 E void FDECL(srandom, (unsigned));
 E char *FDECL(initstate, (unsigned, char *, int));
 E char *FDECL(setstate, (char *));
 E long NDECL(random);
+#endif
 #endif /* RANDOM */
 
 /* ### read.c ### */

include/global.h

@@ -166,6 +166,10 @@ extern struct cross_target_s cross_target;
 #include "ntconf.h"
 #endif
 
+#ifdef AMIGA
+#include "amiconf.h"
+#endif
+
 /* Displayable name of this port; don't redefine if defined in *conf.h */
 #ifndef PORT_ID
 #ifdef AMIGA

include/pcconf.h

@@ -35,7 +35,9 @@
 
 /*#define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */
 
+#ifndef AMIGA_CROSS
 #define SHELL /* via exec of COMMAND.COM */
+#endif
 
 /*
  * Screen control options
@@ -88,7 +90,9 @@
 #define ANSI_DEFAULT
 #endif
 
+#ifndef AMIGA_CROSS
 #define RANDOM /* have Berkeley random(3) */
+#endif
 
 #define MAIL /* Allows for fake mail daemon to deliver mail */
              /* in the MSDOS version.  (For AMIGA MAIL see  */
@@ -101,6 +105,10 @@
 #include <process.h> /* Provides prototypes of exit(), spawn()      */
 #endif
 
+#ifdef AMIGA_CROSS
+#include <spawn.h>
+#endif
+
 #if defined(_MSC_VER) && (_MSC_VER >= 7)
 #include <sys/types.h>
 #include <stdlib.h>
@@ -155,7 +163,9 @@
 
 #endif /* MSDOS configuration stuff */
 
+#ifndef PATHLEN
 #define PATHLEN 64  /* maximum pathlength */
+#endif
 #define FILENAME 80 /* maximum filename length (conservative) */
 #ifndef MICRO_H
 #include "micro.h" /* contains necessary externs for [os_name].c */