Changeset 128

Timestamp:

05/12/07 08:36:30 (2 years ago)

Author:

takkaria

Message:

Slim down ports further (nuke VCS, DOS, IBM, LFB).
Nuke h-config and incorporate it into h-basic.h, now it's much simpler.
Clear up some dead code.

That's all for #110 for 3.0.8; main-xaw can be sorted out in 3.0.9.

Files:

• trunk/src/Makefile.dos (deleted)
• trunk/src/Makefile.src (modified) (2 diffs)
• trunk/src/Makefile.std (modified) (4 diffs)
• trunk/src/config.h (modified) (1 diff)
• trunk/src/h-basic.h (modified) (1 diff)
• trunk/src/h-config.h (deleted)
• trunk/src/main-dos.c (deleted)
• trunk/src/main-gcu.c (modified) (1 diff)
• trunk/src/main-ibm.c (deleted)
• trunk/src/main-lfb.c (deleted)
• trunk/src/main-vcs.c (deleted)
• trunk/src/main.c (modified) (7 diffs)
• trunk/src/z-file.c (modified) (1 diff)

trunk/src/Makefile.src

@@ -6 +6 @@
-#
-
- h-config.h
+
-INCS = angband.h config.h defines.h externs.h types.h \
-       z-term.h z-rand.h z-type.h z-util.h z-virt.h z-form.h
@@ -14 +14 @@
-ZFILES = z-file z-form z-rand z-term z-type z-util z-virt
-MAINFILES = main maid-x11 \
-dos gcu gtk ibm ros sdl vcs
+gcu gtk ros sdl
-
-ANGFILES = \

trunk/src/Makefile.std

@@ -4 +4 @@
-# This makefile probably requires GNU make.
-#
-
-
-
+
+
-#
-# You can also place your alterations to a file in the src/ directory called 
-# "config", in which case that file will override what is specified here.
-#
-# If you used to use Makefile.gtk or Makefile.lsl, uncomment the appropriate
-# lines below.
-#
-
@@ -44 +40 @@
-SYS_gtk = -DUSE_GTK $(shell pkg-config gtk+-2.0 --libs --cflags)
-
-# Support raw console access (main-lfb.c) -- Linux only
-SYS_lfb = -DUSE_LFB
-
-# Support SDL frontend
-#SYS_sdl = -DUSE_SDL $(shell sdl-config --cflags) $(shell sdl-config --libs) -lSDL_ttf
-
-
-
-
-# Old raw tty protocols that may not work
-# With curses support, all are effectively superceded by USE_GCU
-
-# Support direct termio on 8bit color-depth screen (main-vcs.c)
-#SYS_vcs = -DUSE_VCS
-
-
@@ -98 +83 @@
-# Enable linux-specific modules, if requested.
-ifeq ($(uname),Linux)
-  MODULES += $(SYS_lfb) $(SYS_vcs)
-  LINUXOBJS = main-vcs.o main-lfb.o
-  CFLAGS += -DHAVE_MKSTEMP
-endif
@@ -106 +89 @@
-# Object definitions
-X11OBJS = maid-x11.o main-x11.o main-xaw.o main-gtk.o
- $(LINUXOBJS)
+
-OBJS = $(BASEOBJS) $(MAINOBJS)
-

trunk/src/config.h

@@ -377 +377 @@
-#endif
-
-/*
- * Hack -- Special "ancient machine" versions
- */
-#if defined(USE_286) || defined(ANGBAND_LITE_MAC)
-# ifndef ANGBAND_LITE
-#  define ANGBAND_LITE
-# endif
-#endif
-
-/*

trunk/src/h-basic.h

@@ -13 +13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/src/main-gcu.c

@@ -85 +85 @@
-#define USE_TPOSIX
-
-/*
- * Hack -- Amiga uses "fake curses" and cannot do any of this stuff
- */
-#if defined(AMIGA)
-# undef USE_TPOSIX
-#endif
-
-/*

trunk/src/main.c

@@ -46 +46 @@
-#endif /* USE_X11 */
-
-#ifdef USE_XPJ
-        { "xpj", help_xpj, init_xpj },
-#endif /* USE_XPJ */
-
-#ifdef USE_GCU
-        { "gcu", help_gcu, init_gcu },
-#endif /* USE_GCU */
-
-#ifdef USE_CAP
-        { "cap", help_cap, init_cap },
-#endif /* USE_CAP */
-
-#ifdef USE_DOS
-        { "dos", help_dos, init_dos },
-#endif /* USE_DOS */
-
-#ifdef USE_IBM
-        { "ibm", help_ibm, init_ibm },
-#endif /* USE_IBM */
-
-#ifdef USE_EMX
-        { "emx", help_emx, init_emx },
-#endif /* USE_EMX */
-
-#ifdef USE_SLA
-        { "sla", help_sla, init_sla },
-#endif /* USE_SLA */
-
-#ifdef USE_LSL
-        { "lsl", help_lsl, init_lsl },
-#endif /* USE_LSL */
-
-#ifdef USE_AMI
-        { "ami", help_ami, init_ami },
-#endif /* USE_AMI */
-
-#ifdef USE_VCS
-        { "vcs", help_vcs, init_vcs },
-#endif /* USE_VCS */
-
-#ifdef USE_LFB
-        { "lfb", help_lfb, init_lfb },
-#endif /* USE_LFB */
-};
-
@@ -116 +76 @@
-
-
-
-/*
- * Set the stack size (for the Amiga)
- */
-#ifdef AMIGA
-# include <dos.h>
-__near long __stack = 32768L;
-#endif /* AMIGA */
-
-
-/*
- * Set the stack size and overlay buffer (see main-286.c")
- */
-#ifdef USE_286
-# include <dos.h>
-extern unsigned _stklen = 32768U;
-extern unsigned _ovrbuffer = 0x1500;
-#endif /* USE_286 */
-
-/*
@@ -158 +100 @@
- * relevant "sub-directory names" to the given path.
- *
- * Note that the "path" must be "Angband:" for the Amiga, and it
- * is ignored for "VM/ESA", so I just combined the two.
- *
- * Make sure that the path doesn't overflow the buffer.  We have
- * to leave enough space for the path separator, directory, and
@@ -169 +108 @@
-        char path[1024];
-
-#if defined(AMIGA)
-
-        /* Hack -- prepare "path" */
-        strcpy(path, "Angband:");
-
-#else /* AMIGA */
-
-        cptr tail = NULL;
-
@@ -193 +125 @@
-        /* Hack -- Add a path separator (only if needed) */
-        if (!suffix(path, PATH_SEP)) my_strcat(path, PATH_SEP, sizeof(path));
-
-#endif /* AMIGA */
-
-        /* Initialize */
@@ -330 +260 @@
-
-
-#ifdef USE_286
-        /* Attempt to use XMS (or EMS) memory for swap space */
-        if (_OvrInitExt(0L, 0L))
-        {
-                _OvrInitEms(0, 0, 64);
-        }
-#endif /* USE_286 */
-
-
-#ifdef SET_UID
-
@@ -355 +276 @@
-        /* Get the user id (?) */
-        player_uid = getuid();
-
-#ifdef VMS
-        /* Mega-Hack -- Factor group id */
-        player_uid += (getgid() * 1000);
-#endif /* VMS */
-
-# ifdef SAFE_SETUID

trunk/src/z-file.c

@@ -798 +798 @@
-
-
+/*
+ * Assume UNIX-style directory handling.
+ */
+#if !defined(HAVE_CONFIG_H) && !defined(WINDOWS) && !defined(RISCOS)
+#define HAVE_DIRENT_H
+#endif
+
+
-#ifdef WINDOWS
-