From: nhmall <nhmall@nethack.org>
Date: Sat, 7 May 2022 17:08:02 +0000 (-0400)
Subject: some follow-up for MSDOS build
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36d3b6432614315b81eeb5b300b3a98265acc016;p=nethack

some follow-up for MSDOS build

The preprocessor directives in win/tty/wintty.c were crossed-up
under MSDOS build. I think I got them straightened out now.

For a crosscompile situation, the tilemap utility (which runs on
the host) needs to produce an output src/tile.c that is compatible
for the target platform.

Don't use ENHANCED_SYMBOLS under MSDOS, for now anyway.
---

diff --git a/include/config.h b/include/config.h
index 9c59cb9eb..f066c02d9 100644
--- a/include/config.h
+++ b/include/config.h
@@ -661,6 +661,10 @@ typedef unsigned char uchar;
 # endif
 #endif
 
+#if defined(MSDOS) && defined(ENHANCED_SYMBOLS)
+#undef ENHANCED_SYMBOLS
+#endif
+
 #include "integer.h"
 #include "global.h" /* Define everything else according to choices above */
 
diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index 02ec1ffe4..b9464191d 100644
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -54,6 +54,10 @@ extern void exit(int);
 #endif
 #endif
 
+#if defined(CROSSCOMPILE) && defined(ENHANCED_SYMBOLS)
+#undef ENHANCED_SYMBOLS
+#endif
+
 struct {
     int idx;
     const char *tilelabel;
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index b4494385b..b54b8985f 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -3417,6 +3417,10 @@ g_putch(int in_ch)
     return;
 }
 
+
+#if !defined(NO_TERMS) && !defined(WIN32)
+#ifdef ENHANCED_SYMBOLS
+
 void
 g_pututf8(uint8 *utf8str)
 {
@@ -3427,7 +3431,8 @@ g_pututf8(uint8 *utf8str)
     }
     return;
 }
-#endif /* !WIN32 */
+#endif
+#endif /* !NO_TERMS && !WIN32 */
 
 #ifdef CLIPPING
 void
@@ -3542,10 +3547,10 @@ tty_print_glyph(winid window, xchar x, xchar y,
             if (color != NO_COLOR)
                 term_start_color(color);
 #endif /* TEXTCOLOR */
-#if !defined(NO_TERMS) || defined(WIN32)
         }
 #endif
-    }   /* iflags.use_color aka iflags.wc_color */
+    }
+    /* iflags.use_color aka iflags.wc_color */
     /* must be after color check; term_end_color may turn off inverse too;
        BW_LAVA and BW_ICE won't ever be set when color is on;
        (tried bold for ice but it didn't look very good; inverse is easier