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.
This commit is contained in:
nhmall
2022-05-07 13:08:02 -04:00
parent 4fbda9ea34
commit 36d3b64326
3 changed files with 16 additions and 3 deletions

View File

@@ -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 */

View File

@@ -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;

View File

@@ -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