From 805c90e3488e1b46919a272cfa696bbf25ef8901 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 24 Oct 2001 09:25:05 +0000 Subject: [PATCH] Moved input stuff to arch subdirs, as in d1x. --- arch/Makefile.am | 2 +- arch/dos/Makefile.am | 3 +- input/dos_joy2.asm => arch/dos/joy2.asm | 9 ++-- input/dos_joyc.c => arch/dos/joyc.c | 9 ++-- input/dos_joydefs.c => arch/dos/joydefs.c | 9 ++-- input/dos_key.c => arch/dos/key.c | 7 ++- input/dos_mouse.c => arch/dos/mouse.c | 7 ++- input/ggi_event.c => arch/ggi/event.c | 9 ++-- input/ggi_init.c => arch/ggi/init.c | 9 ++-- input/ggi_key.c => arch/ggi/key.c | 9 ++-- input/ggi_mouse.c => arch/ggi/mouse.c | 9 ++-- arch/linux/Makefile.am | 5 ++- .../linux/include/joystick.h | 0 input/linux_joydefs.c => arch/linux/joydefs.c | 11 +++-- .../linux_joystick.c => arch/linux/joystick.c | 11 +++-- arch/sdl/Makefile.am | 2 +- input/sdl_event.c => arch/sdl/event.c | 9 ++-- input/sdl_joy.c => arch/sdl/joy.c | 7 ++- input/sdl_joydefs.c => arch/sdl/joydefs.c | 7 ++- input/sdl_key.c => arch/sdl/key.c | 9 ++-- input/sdl_mouse.c => arch/sdl/mouse.c | 9 ++-- input/svgalib_event.c => arch/svgalib/event.c | 9 ++-- input/svgalib_init.c => arch/svgalib/init.c | 9 ++-- input/svgalib_key.c => arch/svgalib/key.c | 9 ++-- input/svgalib_mouse.c => arch/svgalib/mouse.c | 9 ++-- input/Makefile.am | 45 ------------------- 26 files changed, 125 insertions(+), 108 deletions(-) rename input/dos_joy2.asm => arch/dos/joy2.asm (98%) rename input/dos_joyc.c => arch/dos/joyc.c (99%) rename input/dos_joydefs.c => arch/dos/joydefs.c (99%) rename input/dos_key.c => arch/dos/key.c (99%) rename input/dos_mouse.c => arch/dos/mouse.c (99%) rename input/ggi_event.c => arch/ggi/event.c (94%) rename input/ggi_init.c => arch/ggi/init.c (61%) rename input/ggi_key.c => arch/ggi/key.c (98%) rename input/ggi_mouse.c => arch/ggi/mouse.c (94%) rename input/linux/include/linux_joystick.h => arch/linux/include/joystick.h (100%) rename input/linux_joydefs.c => arch/linux/joydefs.c (97%) rename input/linux_joystick.c => arch/linux/joystick.c (97%) rename input/sdl_event.c => arch/sdl/event.c (88%) rename input/sdl_joy.c => arch/sdl/joy.c (85%) rename input/sdl_joydefs.c => arch/sdl/joydefs.c (60%) rename input/sdl_key.c => arch/sdl/key.c (99%) rename input/sdl_mouse.c => arch/sdl/mouse.c (97%) rename input/svgalib_event.c => arch/svgalib/event.c (77%) rename input/svgalib_init.c => arch/svgalib/init.c (59%) rename input/svgalib_key.c => arch/svgalib/key.c (98%) rename input/svgalib_mouse.c => arch/svgalib/mouse.c (96%) delete mode 100644 input/Makefile.am diff --git a/arch/Makefile.am b/arch/Makefile.am index 5ef61cb2..3378a183 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = @D2X_ARCH_SUBDIRS@ -DIST_SUBDIRS = dos linux sdl win32 +DIST_SUBDIRS = dos ggi linux sdl svgalib win32 EXTRA_SUBDIRS = include diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am index 2584e5b1..6683c36b 100644 --- a/arch/dos/Makefile.am +++ b/arch/dos/Makefile.am @@ -4,7 +4,8 @@ noinst_LIBRARIES = libarch_dos.a INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(srcdir)/include -libarch_dos_a_SOURCES = dpmi.c findfile.c init.c ipx.c vesa.c +libarch_dos_a_SOURCES = \ +dpmi.c findfile.c init.c ipx.c joyc.c joydefs.c key.c mouse.c vesa.c SUFFIXES = .asm %.o: %.asm diff --git a/input/dos_joy2.asm b/arch/dos/joy2.asm similarity index 98% rename from input/dos_joy2.asm rename to arch/dos/joy2.asm index 195fc61e..98eea348 100644 --- a/input/dos_joy2.asm +++ b/arch/dos/joy2.asm @@ -9,14 +9,17 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/input/dos_joy2.asm,v $ -; $Revision: 1.1.1.1 $ +; $Source: /cvs/cvsroot/d2x/arch/dos/joy2.asm,v $ +; $Revision: 1.3 $ ; $Author: bradleyb $ -; $Date: 2001-01-19 03:33:43 $ +; $Date: 2001-10-24 09:25:05 $ ; ; Contains routines for joystick interface. ; ; $Log: not supported by cvs2svn $ +; Revision 1.1.1.1 2001/01/19 03:33:43 bradleyb +; Import of d2x-0.0.9-pre1 +; ; Revision 1.1.1.1 1999/06/14 21:57:53 donut ; Import of d1x 1.37 source. ; diff --git a/input/dos_joyc.c b/arch/dos/joyc.c similarity index 99% rename from input/dos_joyc.c rename to arch/dos/joyc.c index 260874af..4756fb85 100644 --- a/input/dos_joyc.c +++ b/arch/dos/joyc.c @@ -12,14 +12,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/input/dos_joyc.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/dos/joyc.c,v $ + * $Revision: 1.4 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:56 $ + * $Date: 2001-10-24 09:25:05 $ * * Routines for joystick reading. * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:56 bradleyb + * Fixed build, minor fixes + * * Revision 1.2 2001/01/24 04:29:45 bradleyb * changed args_find to FindArg * diff --git a/input/dos_joydefs.c b/arch/dos/joydefs.c similarity index 99% rename from input/dos_joydefs.c rename to arch/dos/joydefs.c index 8124f923..4f08e56c 100644 --- a/input/dos_joydefs.c +++ b/arch/dos/joydefs.c @@ -12,14 +12,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/input/dos_joydefs.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/dos/joydefs.c,v $ + * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * . * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * * Revision 1.1.1.2 2001/01/19 03:33:52 bradleyb * Import of d2x-0.0.9-pre1 * diff --git a/input/dos_key.c b/arch/dos/key.c similarity index 99% rename from input/dos_key.c rename to arch/dos/key.c index fbc8762e..ac958305 100644 --- a/input/dos_key.c +++ b/arch/dos/key.c @@ -12,14 +12,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/input/dos_key.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/dos/key.c,v $ * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:44 $ + * $Date: 2001-10-24 09:25:05 $ * * Functions for keyboard handler. * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/31 14:04:44 bradleyb + * Fix compiler warnings + * * Revision 1.2 2001/01/29 14:03:57 bradleyb * Fixed build, minor fixes * diff --git a/input/dos_mouse.c b/arch/dos/mouse.c similarity index 99% rename from input/dos_mouse.c rename to arch/dos/mouse.c index 6bf146de..6d4f8b42 100644 --- a/input/dos_mouse.c +++ b/arch/dos/mouse.c @@ -12,14 +12,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/input/dos_mouse.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/dos/mouse.c,v $ * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:44 $ + * $Date: 2001-10-24 09:25:05 $ * * Functions to access Mouse and Cyberman... * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/31 14:04:44 bradleyb + * Fix compiler warnings + * * Revision 1.2 2001/01/29 14:03:57 bradleyb * Fixed build, minor fixes * diff --git a/input/ggi_event.c b/arch/ggi/event.c similarity index 94% rename from input/ggi_event.c rename to arch/ggi/event.c index 32bb9cfa..417e7230 100644 --- a/input/ggi_event.c +++ b/arch/ggi/event.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/ggi_event.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/ggi/event.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * GGI Event related stuff * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/ggi_init.c b/arch/ggi/init.c similarity index 61% rename from input/ggi_init.c rename to arch/ggi/init.c index 8c05267a..f4b40821 100644 --- a/input/ggi_init.c +++ b/arch/ggi/init.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/ggi_init.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/ggi/init.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * GGI Initialization * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/ggi_key.c b/arch/ggi/key.c similarity index 98% rename from input/ggi_key.c rename to arch/ggi/key.c index 19646800..5985d593 100644 --- a/input/ggi_key.c +++ b/arch/ggi/key.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/ggi_key.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/ggi/key.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * GGI keyboard input support * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/ggi_mouse.c b/arch/ggi/mouse.c similarity index 94% rename from input/ggi_mouse.c rename to arch/ggi/mouse.c index 29cfe43b..f9b35317 100644 --- a/input/ggi_mouse.c +++ b/arch/ggi/mouse.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/ggi_mouse.c,v $ - * $Revision: 1.4 $ + * $Source: /cvs/cvsroot/d2x/arch/ggi/mouse.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * GGI mouse support * * $Log: not supported by cvs2svn $ + * Revision 1.4 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index 41e7fa98..bf78cc23 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -5,9 +5,10 @@ noinst_LIBRARIES = libarch_linux.a INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(srcdir)/include if USE_NETWORK -libarch_linux_a_SOURCES = findfile.c init.c ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c +libarch_linux_a_SOURCES = joydefs.c joystick.c findfile.c init.c \ +ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c else -libarch_linux_a_SOURCES = findfile.c init.c +libarch_linux_a_SOURCES = joydefs.c joystick.c findfile.c init.c endif EXTRA_libarch_linux_a_SOURCES = \ diff --git a/input/linux/include/linux_joystick.h b/arch/linux/include/joystick.h similarity index 100% rename from input/linux/include/linux_joystick.h rename to arch/linux/include/joystick.h diff --git a/input/linux_joydefs.c b/arch/linux/joydefs.c similarity index 97% rename from input/linux_joydefs.c rename to arch/linux/joydefs.c index df4fa3e3..a2e0faf6 100644 --- a/input/linux_joydefs.c +++ b/arch/linux/joydefs.c @@ -12,14 +12,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/input/linux_joydefs.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/linux/joydefs.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * Linux joystick support * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H @@ -54,7 +57,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "digi.h" #include "playsave.h" -#include "linux_joystick.h" +#include "joystick.h" int joydefs_calibrate_flag = 0; diff --git a/input/linux_joystick.c b/arch/linux/joystick.c similarity index 97% rename from input/linux_joystick.c rename to arch/linux/joystick.c index e0daa87f..b569796c 100644 --- a/input/linux_joystick.c +++ b/arch/linux/joystick.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/linux_joystick.c,v $ - * $Revision: 1.4 $ + * $Source: /cvs/cvsroot/d2x/arch/linux/joystick.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * Linux joystick support * * $Log: not supported by cvs2svn $ + * Revision 1.4 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H @@ -25,7 +28,7 @@ #include "mono.h" #include "joy.h" -#include "linux_joystick.h" +#include "joystick.h" char joy_installed = 0; char joy_present = 0; diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am index f9bcdb16..b9b7a111 100644 --- a/arch/sdl/Makefile.am +++ b/arch/sdl/Makefile.am @@ -4,4 +4,4 @@ noinst_LIBRARIES = libarch_sdl.a INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/includes -I$(top_srcdir)/main -libarch_sdl_a_SOURCES = init.c timer.c +libarch_sdl_a_SOURCES = event.c init.c key.c mouse.c timer.c diff --git a/input/sdl_event.c b/arch/sdl/event.c similarity index 88% rename from input/sdl_event.c rename to arch/sdl/event.c index 1731bc81..5498af62 100644 --- a/input/sdl_event.c +++ b/arch/sdl/event.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/sdl_event.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/event.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SDL Event related stuff * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/sdl_joy.c b/arch/sdl/joy.c similarity index 85% rename from input/sdl_joy.c rename to arch/sdl/joy.c index 076ac43e..68bd7767 100644 --- a/input/sdl_joy.c +++ b/arch/sdl/joy.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/sdl_joy.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/joy.c,v $ * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-10 03:01:29 $ + * $Date: 2001-10-24 09:25:05 $ * * SDL joystick support * * $Log: not supported by cvs2svn $ + * Revision 1.1 2001/10/10 03:01:29 bradleyb + * Replacing win32 joystick (broken) with SDL joystick (stubs) + * * */ diff --git a/input/sdl_joydefs.c b/arch/sdl/joydefs.c similarity index 60% rename from input/sdl_joydefs.c rename to arch/sdl/joydefs.c index 5f48a00e..1c4da0c8 100644 --- a/input/sdl_joydefs.c +++ b/arch/sdl/joydefs.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/sdl_joydefs.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/joydefs.c,v $ * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-10 03:01:29 $ + * $Date: 2001-10-24 09:25:05 $ * * SDL joystick support * * $Log: not supported by cvs2svn $ + * Revision 1.1 2001/10/10 03:01:29 bradleyb + * Replacing win32 joystick (broken) with SDL joystick (stubs) + * * */ diff --git a/input/sdl_key.c b/arch/sdl/key.c similarity index 99% rename from input/sdl_key.c rename to arch/sdl/key.c index 1dae0539..d6229a45 100644 --- a/input/sdl_key.c +++ b/arch/sdl/key.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/sdl_key.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/key.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SDL keyboard input support * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/sdl_mouse.c b/arch/sdl/mouse.c similarity index 97% rename from input/sdl_mouse.c rename to arch/sdl/mouse.c index b35746bd..ee5fd4d2 100644 --- a/input/sdl_mouse.c +++ b/arch/sdl/mouse.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/sdl_mouse.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/mouse.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SDL mouse driver. * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/svgalib_event.c b/arch/svgalib/event.c similarity index 77% rename from input/svgalib_event.c rename to arch/svgalib/event.c index 787c0786..e6f648c9 100644 --- a/input/svgalib_event.c +++ b/arch/svgalib/event.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/svgalib_event.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/svgalib/event.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SVGALib Event related stuff * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/svgalib_init.c b/arch/svgalib/init.c similarity index 59% rename from input/svgalib_init.c rename to arch/svgalib/init.c index edc22ee1..6debf1be 100644 --- a/input/svgalib_init.c +++ b/arch/svgalib/init.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/svgalib_init.c,v $ - * $Revision: 1.4 $ + * $Source: /cvs/cvsroot/d2x/arch/svgalib/init.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SVGALib initialization * * $Log: not supported by cvs2svn $ + * Revision 1.4 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/svgalib_key.c b/arch/svgalib/key.c similarity index 98% rename from input/svgalib_key.c rename to arch/svgalib/key.c index c3495e18..572e3546 100644 --- a/input/svgalib_key.c +++ b/arch/svgalib/key.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/svgalib_key.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/svgalib/key.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SVGALib keyboard input support * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/input/svgalib_mouse.c b/arch/svgalib/mouse.c similarity index 96% rename from input/svgalib_mouse.c rename to arch/svgalib/mouse.c index 99df3c56..4c90a62e 100644 --- a/input/svgalib_mouse.c +++ b/arch/svgalib/mouse.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/input/svgalib_mouse.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/svgalib/mouse.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 14:03:57 $ + * $Date: 2001-10-24 09:25:05 $ * * SVGALib mouse support * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 14:03:57 bradleyb + * Fixed build, minor fixes + * * Revision 1.2 2001/01/28 16:09:39 bradleyb * Removed duplicate files, and unified input headers. * diff --git a/input/Makefile.am b/input/Makefile.am deleted file mode 100644 index 98220285..00000000 --- a/input/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -EXTRA_SUBDIRS = linux - -INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include - -noinst_LIBRARIES = libinput.a - -if ENV_DJGPP -libinput_a_SOURCES = dos_key.c dos_joyc.c dos_joydefs.c dos_mouse.c -else -if MINGW32 -libinput_a_SOURCES = sdl_event.c sdl_key.c sdl_mouse.c sdl_joy.c sdl_joydefs.c -else -if USE_GGI -libinput_a_SOURCES = linux_joydefs.c linux_joystick.c \ -ggi_event.c ggi_key.c ggi_mouse.c -else -if USE_SVGALIB -libinput_a_SOURCES = linux_joydefs.c linux_joystick.c \ -svgalib_event.c svgalib_key.c svgalib_mouse.c svgalib_init.c -else -libinput_a_SOURCES = linux_joydefs.c linux_joystick.c \ -sdl_event.c sdl_key.c sdl_mouse.c -endif -endif -endif -endif - -EXTRA_libinput_a_SOURCES = \ -dos_key.c dos_joyc.c dos_joydefs.c dos_mouse.c \ -ggi_event.c ggi_key.c ggi_mouse.c \ -linux_joydefs.c linux_joystick.c \ -sdl_event.c sdl_key.c sdl_mouse.c sdl_joy.c sdl_joydefs.c \ -svgalib_event.c svgalib_key.c svgalib_mouse.c svgalib_init.c - -SUFFIXES = .asm -%.o: %.asm - $(NASM) $(NASMFLAGS) $< -o $@ - -if ENV_DJGPP -libinput_a_LIBADD = dos_joy2.o -endif - -EXTRA_DIST = ${EXTRA_SUBDIRS} \ -dos_joy2.asm \ -ggi_init.c -- 2.39.2