From a6a209edea64ce5f8b007c065b784454b7450add Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Wed, 13 Mar 2002 07:14:24 +0000
Subject: [PATCH] A couple of patches are required unfortunately

Unfortunately a couple of glitches were encountered during the build of
the DOS binary.

Also, somewhere along the way the ability to separate the debug info
for the win32 tty binary into its own PDB file was removed from
Makefile.msc.  I wasn't aware of that until I went to build the binary,
and discovered that I had no PDB file to stow away for bug
reports.
---
 sys/msdos/video.c      | 10 ++--------
 sys/winnt/Makefile.msc |  7 +++----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sys/msdos/video.c b/sys/msdos/video.c
index 888e76327..48460bb1f 100644
--- a/sys/msdos/video.c
+++ b/sys/msdos/video.c
@@ -897,12 +897,8 @@ char *sopt;
  *	getch();
  */
 	iflags.grmode  = 0;
-	iflags.hasvesa = 0;
 	iflags.hasvga  = 0;
-	iflags.has8514 = 0;
-	iflags.usevesa = 0;
 	iflags.usevga  = 0;
-	iflags.use8514 = 0;
 
 	if (strncmpi(sopt,"def",3) == 0) {              /* default */
 		/* do nothing - default */
@@ -939,11 +935,9 @@ char *sopt;
 #  endif
 	/*
 	 * Auto-detect Priorities (arbitrary for now):
-	 *	VESA, 8514, VGA
+	 *	VGA
 	 */
-		if (iflags.hasvesa) iflags.usevesa = 1;
-		else if (iflags.has8514) iflags.use8514 = 1;
-		else if (iflags.hasvga)	{
+		if (iflags.hasvga)	{
 			iflags.usevga  = 1;
 			/* VGA depends on BIOS to enable function keys*/
 			iflags.BIOS = 1;
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 1d20fb4af..490ac047a 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -184,7 +184,7 @@ DLBFLG =
 #==========================================
 
 CFLAGSBASE  = -c $(cflags) $(cvarsmt) -I$(INCL) -nologo $(cdebug) $(WINPINC)
-LFLAGSBASEC = $(linkdebug) $(conflags) $(conlibsmt)
+LFLAGSBASEC = $(linkdebug) /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 $(conlibsmt)
 LFLAGSBASEG = $(linkdebug) $(guiflags) $(guilibsmt) comctl32.lib
 
 #==========================================
@@ -197,8 +197,7 @@ LFLAGSU	= $(LFLAGSBASEC)
 #==========================================
 # - Game build
 #==========================================
-
-LFLAGSBASE = $(linkdebug) $(conflags) $(conlibsmt)
+LFLAGSBASE = $(linkdebug) /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 $(conlibsmt)
 CFLAGS	 = $(CFLAGSBASE) $(WINPFLAG) $(DLBFLG)
 NHLFLAGS1 = /NODEFAULTLIB /INCREMENTAL:NO /PDB:"$(GAME).PDB" /RELEASE /NOLOGO
 NHLFLAGS2 = /MAP:"$(GAME).MAP" /MACHINE:$(CPU) -IGNORE:505 
@@ -574,7 +573,7 @@ $(NHRES): $(NTSYS)\console.rc $(NTSYS)\NetHack.ico
 $(GAMEFILE) : $(ALLOBJ) $(NHRES)
 	@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
 	@echo Linking....
-	@$(link) $(LFLAGS) -out:$@ @<<$(GAME).lnk
+	$(link) $(LFLAGS) -out:$@ @<<$(GAME).lnk
 		$(ALLOBJ:^	=^
 		) $(NHRES)
 <<