From: nhmall Date: Thu, 8 Oct 2020 17:49:24 +0000 (-0400) Subject: be more consistent with CROSS_TO_target macro names for cross-compiles X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dcc328759e5cefbeb99f20657979d6fde04bd94;p=nethack be more consistent with CROSS_TO_target macro names for cross-compiles -DCROSS_TO_MSDOS msdos cross-compile (djgpp cross-compiler) -DCROSS_TO_AMIGA Amiga cross-compile -DCROSS_TO_WASM wasm cross-compile (emscripten) --- diff --git a/include/extern.h b/include/extern.h index 0689c4d9f..52b28f616 100644 --- a/include/extern.h +++ b/include/extern.h @@ -2150,7 +2150,7 @@ E void NDECL(deliver_splev_message); /* ### random.c ### */ #if defined(RANDOM) && !defined(__GO32__) /* djgpp has its own random */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA E void FDECL(srandom, (unsigned)); E char *FDECL(initstate, (unsigned, char *, int)); E char *FDECL(setstate, (char *)); diff --git a/include/pcconf.h b/include/pcconf.h index 86ce2efe7..5e0445eba 100644 --- a/include/pcconf.h +++ b/include/pcconf.h @@ -35,7 +35,7 @@ /*#define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #define SHELL /* via exec of COMMAND.COM */ #endif @@ -90,7 +90,7 @@ #define ANSI_DEFAULT #endif -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #define RANDOM /* have Berkeley random(3) */ #endif @@ -105,7 +105,7 @@ #include /* Provides prototypes of exit(), spawn() */ #endif -#ifdef AMIGA_CROSS +#ifdef CROSS_TO_AMIGA #include #endif diff --git a/outdated/include/amiconf.h b/outdated/include/amiconf.h index 5215515d8..477c9248a 100644 --- a/outdated/include/amiconf.h +++ b/outdated/include/amiconf.h @@ -14,7 +14,7 @@ #include /* get time_t defined before use! */ -#ifdef AMIGA_CROSS +#ifdef CROSS_TO_AMIGA #include #include #endif @@ -56,7 +56,7 @@ typedef long off_t; #define DLBFILE2 "nhsdat" /* sound library */ #endif -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #define FILENAME_CMP stricmp /* case insensitive */ #else #define FILENAME_CMP strcmpi /* case insensitive */ @@ -76,7 +76,7 @@ typedef long off_t; #define MFLOPPY /* You'll probably want this; provides assistance \ * for typical personal computer configurations \ */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #define RANDOM #endif @@ -149,7 +149,7 @@ extern char *FDECL(gets, (char *)); #define TEXTCOLOR /* Use colored monsters and objects */ #define HACKFONT /* Use special hack.font */ -#ifndef AMIGA_CROSS /* issues with prototype and spawnl */ +#ifndef CROSS_TO_AMIGA /* issues with prototype and spawnl */ #define SHELL /* Have a shell escape command (!) */ #endif #define MAIL /* Get mail at unexpected occasions */ diff --git a/outdated/sys/amiga/amidos.c b/outdated/sys/amiga/amidos.c index 4f2413008..402e29535 100644 --- a/outdated/sys/amiga/amidos.c +++ b/outdated/sys/amiga/amidos.c @@ -29,7 +29,7 @@ #endif /* Prototypes */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/amiwind.p" #include "NH:sys/amiga/winami.p" #include "NH:sys/amiga/amidos.p" diff --git a/outdated/sys/amiga/amigst.c b/outdated/sys/amiga/amigst.c index 64cdc2f0e..8f6a74f64 100644 --- a/outdated/sys/amiga/amigst.c +++ b/outdated/sys/amiga/amigst.c @@ -36,7 +36,7 @@ #include #endif -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/winami.p" #include "NH:sys/amiga/amiwind.p" #include "NH:sys/amiga/amidos.p" diff --git a/outdated/sys/amiga/amiwind.c b/outdated/sys/amiga/amiwind.c index 9654fb5d9..456b727c9 100644 --- a/outdated/sys/amiga/amiwind.c +++ b/outdated/sys/amiga/amiwind.c @@ -3,7 +3,7 @@ /* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993,1996 */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" @@ -26,7 +26,7 @@ static int BufferGetchar(void); static void ProcessMessage(register struct IntuiMessage *message); #define BufferQueueChar(ch) (KbdBuffer[KbdBuffered++] = (ch)) -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA struct Library *ConsoleDevice; #else struct Device * @@ -36,7 +36,7 @@ struct Device * ConsoleDevice; #endif -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/amimenu.c" #else #include "amimenu.c" diff --git a/outdated/sys/amiga/winamenu.c b/outdated/sys/amiga/winamenu.c index cf1d75376..4762bc8a4 100644 --- a/outdated/sys/amiga/winamenu.c +++ b/outdated/sys/amiga/winamenu.c @@ -3,7 +3,7 @@ */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" diff --git a/outdated/sys/amiga/winami.c b/outdated/sys/amiga/winami.c index 0a9bd2951..3e743fb38 100644 --- a/outdated/sys/amiga/winami.c +++ b/outdated/sys/amiga/winami.c @@ -3,7 +3,7 @@ */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" @@ -15,7 +15,7 @@ #include "dlb.h" -#ifdef AMIGA_CROSS +#ifdef CROSS_TO_AMIGA #define strnicmp strncmpi #endif diff --git a/outdated/sys/amiga/winchar.c b/outdated/sys/amiga/winchar.c index 020b721ed..9fb0508dc 100644 --- a/outdated/sys/amiga/winchar.c +++ b/outdated/sys/amiga/winchar.c @@ -14,14 +14,14 @@ #ifdef TESTING #include "hack.h" #else -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:src/tile.c" #else #include "../src/tile.c" #endif #endif -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:win/share/tile.h" #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" diff --git a/outdated/sys/amiga/winfuncs.c b/outdated/sys/amiga/winfuncs.c index 130d66cc9..dfbae4312 100644 --- a/outdated/sys/amiga/winfuncs.c +++ b/outdated/sys/amiga/winfuncs.c @@ -3,7 +3,7 @@ */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" @@ -17,7 +17,7 @@ #include "date.h" extern struct TagItem scrntags[]; -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA extern struct Library *ConsoleDevice; #else extern struct Device * @@ -792,7 +792,7 @@ amii_create_nhwindow(type) register int type; } ConsoleDevice = -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA (struct Library *) #else (struct Device * diff --git a/outdated/sys/amiga/winkey.c b/outdated/sys/amiga/winkey.c index 0964f0574..9534c0c6d 100644 --- a/outdated/sys/amiga/winkey.c +++ b/outdated/sys/amiga/winkey.c @@ -2,7 +2,7 @@ /* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" diff --git a/outdated/sys/amiga/winreq.c b/outdated/sys/amiga/winreq.c index fecf2b4ce..af4c303de 100644 --- a/outdated/sys/amiga/winreq.c +++ b/outdated/sys/amiga/winreq.c @@ -2,7 +2,7 @@ /* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" @@ -45,7 +45,7 @@ struct NewWindow StrWindow = { &String, NULL, NULL, NULL, NULL, 5, 5, 0xffff, 0xffff, CUSTOMSCREEN }; -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/colorwin.c" #else #include "colorwin.c" @@ -58,7 +58,7 @@ struct NewWindow StrWindow = { #define GADOKAY 6 #define GADCANCEL 7 -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/clipwin.c" #else #include "clipwin.c" diff --git a/outdated/sys/amiga/winstr.c b/outdated/sys/amiga/winstr.c index d74e566a0..cbca9ba4b 100644 --- a/outdated/sys/amiga/winstr.c +++ b/outdated/sys/amiga/winstr.c @@ -2,7 +2,7 @@ /* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef AMIGA_CROSS +#ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/windefs.h" #include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winproto.h" diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index 633c1f13a..2367c84ea 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -754,7 +754,7 @@ char *str; } #endif /* EXEPATH */ -#ifdef AMIGA_CROSS +#ifdef CROSS_TO_AMIGA void msmsg VA_DECL(const char *, fmt) { diff --git a/sys/share/pcsys.c b/sys/share/pcsys.c index c027827c4..af30e4423 100644 --- a/sys/share/pcsys.c +++ b/sys/share/pcsys.c @@ -12,10 +12,10 @@ #include #include -#if !defined(MSDOS) && !defined(WIN_CE) && !defined(AMIGA_CROSS) +#if !defined(MSDOS) && !defined(WIN_CE) && !defined(CROSS_TO_AMIGA) #include #endif -#if defined(__GO32__) || defined(AMIGA_CROSS) +#if defined(__GO32__) || defined(CROSS_TO_AMIGA) #define P_WAIT 0 #define P_NOWAIT 1 #endif @@ -154,7 +154,7 @@ const char *str; #ifdef TOS msmsg("Hit %s.", str); #else -#ifdef AMIGA_CROSS +#ifdef CROSS_TO_AMIGA (void) printf("Hit %s.", str); #else msmsg("Hit %s.", str); diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020 index c9bc0a51f..ec87da241 100644 --- a/sys/unix/hints/include/cross-pre.2020 +++ b/sys/unix/hints/include/cross-pre.2020 @@ -163,7 +163,7 @@ override TARGET_AR = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc-ar override TARGET_STUBEDIT = ../lib/djgpp/i586-pc-msdosdjgpp/bin/stubedit override TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \ $(LUAINCL) -DDLB $(PDCURSESDEF) \ - -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET + -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS override TARGET_CXXFLAGS = $(TARGET_CFLAGS) override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc override TARGET_LFLAGS= @@ -235,9 +235,9 @@ override TARGET_STUBEDIT= override TARGET_CFLAGS = -c -O $(TOOLARCH) \ -I../include -I../outdated/include \ -I../outdated/sys/amiga -I../win/share \ - $(LUAINCL) -DAMIGA -DAMIGA_CROSS $(PDCURSESDEF) \ - -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET \ - -DAMIGA_VERSION_STRING=\""VER: NetHack 3.7.0 \(12.13.2020)\"" + $(LUAINCL) -DAMIGA -DUSE_TILES $(PDCURSESDEF) \ + -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_AMIGA \ + -DAMIGA_VERSION_STRING=\""VER: NetHack 3.7.0\"" override TARGET_CXXFLAGS = $(TARGET_CFLAGS) ifeq "$(REGEXOBJ)" "$(TARGETPFX)cppregex.o" override TARGET_LINK = $(TARGET_CXX)