From: nethack.allison <nethack.allison>
Date: Mon, 4 Mar 2002 03:22:23 +0000 (+0000)
Subject: OPTIONS_FILE core changes
X-Git-Tag: MOVE2GIT~3072
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8b2b8bd513511c086c0f238059136acf6ad41b0;p=nethack

OPTIONS_FILE core changes
-Allow overriding of OPTIONS_FILE in makdefs.c
-Change obsolete WIN32_GRAPHICS to the correct MSWIN_GRAPHICS
-Remove the 8514 and VESA screen control stuff since it never existed.
---

diff --git a/include/global.h b/include/global.h
index ff7d71061..1b58701d8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -215,7 +215,12 @@ typedef xchar	boolean;		/* 0 or 1 */
 #  define PORT_ID	"VMS"
 # endif
 # ifdef WIN32
-#  define PORT_ID	"NT"
+#  define PORT_ID	"Windows"
+#  ifdef MSWIN_GRAPHICS
+#   define PORT_SUB_ID	"graphical"
+#  else
+#   define PORT_SUB_ID	"tty"
+#  endif
 # endif
 #endif
 
diff --git a/util/makedefs.c b/util/makedefs.c
index 1f840e74c..fa9d565eb 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)makedefs.c	3.4	1999/08/16	*/
+/*	SCCS Id: @(#)makedefs.c	3.4	2002/03/03	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) M. Stephenson, 1990, 1991.			  */
 /* Copyright (c) Dean Luick, 1990.				  */
@@ -56,7 +56,9 @@ static	const char	SCCS_Id[] = "@(#)makedefs.c\t3.4\t2002/02/03";
 #define DATE_FILE	"date.h"
 #define MONST_FILE	"pm.h"
 #define ONAME_FILE	"onames.h"
+#ifndef OPTIONS_FILE
 #define OPTIONS_FILE	"options"
+#endif
 #define ORACLE_FILE	"oracles"
 #define DATA_FILE	"data"
 #define RUMOR_FILE	"rumors"
@@ -671,18 +673,12 @@ static const char *build_opts[] = {
 # ifdef MAC
 		"screen control via mactty",
 # endif
-# ifdef SCREEN_8514
-		"screen control via 8514/A graphics",
-# endif
 # ifdef SCREEN_BIOS
 		"screen control via BIOS",
 # endif
 # ifdef SCREEN_DJGPPFAST
 		"screen control via DJGPP fast",
 # endif
-# ifdef SCREEN_VESA
-		"screen control via VESA graphics",
-# endif
 # ifdef SCREEN_VGA
 		"screen control via VGA graphics",
 # endif
@@ -752,7 +748,7 @@ static const char *window_opts[] = {
 #ifdef GEM_GRAPHICS
 		"Gem",
 #endif
-#ifdef WIN32_GRAPHICS
+#ifdef MSWIN_GRAPHICS
 		"Win32",
 #endif
 #ifdef BEOS_GRAPHICS