USE_VME,USE_AMI,USE_LSL,USE_SLA,USE_EMX プリプロセッサを除去。 / Remove USE_VME,USE_AMI,USE_LSL...

diff --git a/src/files.c b/src/files.c
index b40d81f..2c3a126 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -5789,7 +5789,7 @@ void process_player_name(bool sf)
        if (character_generated) strcpy(old_player_base, player_base);
 
        /* Cannot be too long */
-#if defined(MACINTOSH) || defined(USE_EMX) || defined(ACORN) || defined(VM)
+#if defined(MACINTOSH) || defined(ACORN)
        if (strlen(p_ptr->name) > 15)
        {
                /* Name too long */

diff --git a/src/h-config.h b/src/h-config.h
index f9a5dc1..001f2c2 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -152,7 +152,6 @@
  * or for the "Atari" platform which is Unix-like, apparently
  */
 #if !defined(MACINTOSH) && !defined(WINDOWS) && \
-    !defined(USE_EMX) && \
     !defined(ACORN) && !defined(VM)
 # define SET_UID
 #endif
@@ -194,7 +193,7 @@
 # undef PATH_SEP
 # define PATH_SEP "\\"
 #endif
-#if defined(OS2) || defined(USE_EMX)
+#if defined(OS2)
 # undef PATH_SEP
 # define PATH_SEP "\\"
 #endif

diff --git a/src/h-system.h b/src/h-system.h
index bb5aa47..80d2c05 100644 (file)
--- a/src/h-system.h
+++ b/src/h-system.h
@@ -68,7 +68,7 @@
 #endif
 
 
-#if defined(WINDOWS) || defined(USE_EMX)
+#if defined(WINDOWS)
 # include <io.h>
 #endif
 

diff --git a/src/main.c b/src/main.c
index 70410f1..d741c80 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -550,18 +550,6 @@ int main(int argc, char *argv[])
                                puts("  -mibm    To use IBM (BIOS text mode)");
 #endif /* USE_IBM */
 
-#ifdef USE_SLA
-                               puts("  -msla    To use SLA (SLANG)");
-#endif /* USE_SLA */
-
-#ifdef USE_LSL
-                               puts("  -mlsl    To use LSL (Linux-SVGALIB)");
-#endif /* USE_LSL */
-
-#ifdef USE_VME
-                               puts("  -mvme    To use VME (VAX/ESA)");
-#endif /* USE_VME */
-
                                /* Actually abort the process */
                                quit(NULL);
                        }
@@ -666,76 +654,6 @@ int main(int argc, char *argv[])
 #endif
 
 
-#ifdef USE_EMX
-       /* Attempt to use the "main-emx.c" support */
-       if (!done && (!mstr || (streq(mstr, "emx"))))
-       {
-               extern errr init_emx(void);
-               if (0 == init_emx())
-               {
-                       ANGBAND_SYS = "emx";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_SLA
-       /* Attempt to use the "main-sla.c" support */
-       if (!done && (!mstr || (streq(mstr, "sla"))))
-       {
-               extern errr init_sla(void);
-               if (0 == init_sla())
-               {
-                       ANGBAND_SYS = "sla";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_LSL
-       /* Attempt to use the "main-lsl.c" support */
-       if (!done && (!mstr || (streq(mstr, "lsl"))))
-       {
-               extern errr init_lsl(void);
-               if (0 == init_lsl())
-               {
-                       ANGBAND_SYS = "lsl";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_AMI
-       /* Attempt to use the "main-ami.c" support */
-       if (!done && (!mstr || (streq(mstr, "ami"))))
-       {
-               extern errr init_ami(void);
-               if (0 == init_ami())
-               {
-                       ANGBAND_SYS = "ami";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_VME
-       /* Attempt to use the "main-vme.c" support */
-       if (!done && (!mstr || (streq(mstr, "vme"))))
-       {
-               extern errr init_vme(void);
-               if (0 == init_vme())
-               {
-                       ANGBAND_SYS = "vme";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
        /* Make sure we have a display! */
        if (!done) quit("Unable to prepare any 'display module'!");
 

diff --git a/src/z-config.h b/src/z-config.h
index cf2c277..ab61623 100644 (file)
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -65,7 +65,7 @@
  * The old "USE_NCU" option has been replaced with "USE_GCU".
  *
  * Several other such options are available for non-unix machines,
- * such as "MACINTOSH", "WINDOWS", "USE_IBM", "USE_EMX".
+ * such as "MACINTOSH", "WINDOWS", "USE_IBM".
  *
  * You may also need to specify the "system", using defines such as
  * "SOLARIS" (for Solaris), etc, see "h-config.h" for more info.
@@ -292,17 +292,6 @@
 
 
 /*
- * OPTION: Hack -- EMX stuff
- */
-#ifdef USE_EMX
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
-
-/*
  * OPTION: Set the "default" path to the angband "lib" directory.
  *
  * See "main.c" for usage, and note that this value is only used on