More header unification...

arch/Makefile.am

@@ -1,7 +1,7 @@
-SUBDIRS = dos linux ogl sdl win32
+SUBDIRS = include dos linux ogl sdl win32
 
 noinst_LIBRARIES = libarch.a
-INCLUDES = -I $(top_srcdir)/includes -I $(top_srcdir)/main
+INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include
 
 libarch_a_SOURCES = \
 dos_init.c dos_vesa.c dos_findfile.c dos_dpmi.c dos_ipx.c \

arch/dos/include/Makefile.am

@@ -1,2 +1,2 @@
 EXTRA_DIST = \
-commlib.h disk.h dzcomm.h joy.h key.h midiallg.h mouse.h serial.h
+commlib.h disk.h dzcomm.h midiallg.h serial.h

arch/include/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = event.h key.h mouse.h joy.h

arch/include/key.h

@@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 /*
  * $Source: /cvs/cvsroot/d2x/arch/include/key.h,v $
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
  * $Author: bradleyb $
- * $Date: 2001-01-28 05:46:33 $
+ * $Date: 2001-01-28 16:21:54 $
  *
  * Header for keyboard functions
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2001/01/28 05:46:33  bradleyb
+ * Unified arch headers
+ *
  */
 
 #ifndef _KEY_H
@@ -28,9 +31,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "fix.h"
 
-//to be called from arch-specific key event handlers.
-void generic_key_handler(int event_key,int key_state);
-
 //==========================================================================
 // This installs the int9 vector and initializes the keyboard in buffered
 // ASCII mode. key_close simply undoes that.
@@ -43,7 +43,6 @@ extern void key_close();
 // set it to 1 and it will buffer scancodes.
 extern unsigned char keyd_buffer_type;
 extern unsigned char keyd_repeat;     // 1=allow repeating, 0=dont allow repeat
-extern unsigned char keyd_fake_repeat; //0=arch generates own repeats 1=do it ourselves -MPM
 
 // keyd_editor_mode... 0=game mode, 1=editor mode.
 // Editor mode makes key_down_time always return 0 if modifiers are down.

conf.h.in

@@ -50,9 +50,8 @@
 # define SDL_AUDIO 1
 
 # ifdef OGL
-#  define GLX_VIDEO 1
-#  define GII_INPUT 1
-#  define GII_XWIN 1
+#  define SDL_GL_VIDEO 1
+#  define SDL_INPUT 1
 # else
 #  ifdef GGI
 #   define GGI_VIDEO 1

configure.in

@@ -66,12 +66,12 @@ else
       OGL_LIBS="-lGL", 
       [AC_MSG_ERROR([GL not found, OpenGL cannot be built])
        opengl=false],
-       -L/usr/X11R6/lib -lX11 -lXext -lm)
+       )
     AC_CHECK_LIB(GLU,main,
       OGL_LIBS="${OGL_LIBS} -lGLU",
       [AC_MSG_ERROR([GLU not found, OpenGL cannot be built])
        opengl=false],
-       -lGL -L/usr/X11R6/lib -lX11 -lXext -lm)
+       -lGL)
   fi
   AC_SUBST(OGL_LIBS)
   AM_CONDITIONAL(USE_OPENGL, test x$opengl = xtrue)
@@ -122,17 +122,12 @@ else
 
   if test x$opengl = xtrue; then
     AC_DEFINE(OGL)
-    CFLAGS="-I \$(top_srcdir)/input/ggi/include $CFLAGS"
   else
     if test x$svga = xtrue; then
       AC_DEFINE(SVGA)
-      CFLAGS="-I \$(top_srcdir)/input/svgalib/include $CFLAGS"
     else
       if test x$ggi = xtrue; then
         AC_DEFINE(GGI)
-        CFLAGS="-I \$(top_srcdir)/input/ggi/include $CFLAGS"
-      else
-        CFLAGS="-I \$(top_srcdir)/input/sdl/include $CFLAGS"
       fi
     fi
   fi
@@ -202,6 +197,7 @@ arch/dos/comm/include/Makefile
 arch/dos/include/Makefile
 arch/dos/mm_snd/Makefile
 arch/dos/mm_snd/include/Makefile
+arch/include/Makefile
 arch/ogl/Makefile
 arch/ogl/include/Makefile
 arch/linux/Makefile
@@ -217,14 +213,8 @@ iff/Makefile
 iff/archive/Makefile
 includes/Makefile
 input/Makefile
-input/ggi/Makefile
-input/ggi/include/Makefile
 input/linux/Makefile
 input/linux/include/Makefile
-input/sdl/Makefile
-input/sdl/include/Makefile
-input/svgalib/Makefile
-input/svgalib/include/Makefile
 main/Makefile
 main/editor/Makefile
 main/old/Makefile

main/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = editor old
 
-INCLUDES = -I$(top_srcdir)/includes -fwritable-strings
+INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include -fwritable-strings
 
 bin_PROGRAMS = d2x