From f3788507f3059c42321d4c2709f0ecd2dd7e25ec Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 25 Oct 2001 08:25:35 +0000 Subject: [PATCH] Finished moving stuff to arch/blah. I know, it's ugly, but It'll be easier to sync with d1x. --- Makefile.am | 2 +- arch/Makefile.am | 2 +- arch/dos/Makefile.am | 4 +--- sound/dos_cdrom.c => arch/dos/cdrom.c | 7 ++++-- sound/dos_digi.c => arch/dos/digi.c | 7 ++++-- video/dos_gr.c => arch/dos/gr.c | 9 +++++--- arch/ggi/Makefile.am | 2 +- video/ggi_gr.c => arch/ggi/gr.c | 9 +++++--- arch/ogl/Makefile.am | 11 +++++++++ video/ogl_glx.c => arch/ogl/glx.c | 9 +++++--- video/ogl_gr.c => arch/ogl/gr.c | 9 +++++--- {video => arch/ogl}/ogl.c | 9 +++++--- video/ogl_sdl.c => arch/ogl/sdlgl.c | 9 +++++--- video/ogl_wgl.c => arch/ogl/wgl.c | 9 +++++--- arch/sdl/Makefile.am | 4 ++-- sound/sdl_cdrom.c => arch/sdl/cdrom.c | 9 +++++--- sound/sdl_digi.c => arch/sdl/digi.c | 9 +++++--- video/sdl_gr.c => arch/sdl/gr.c | 9 +++++--- arch/svgalib/Makefile.am | 2 +- video/svgalib_gr.c => arch/svgalib/gr.c | 9 +++++--- configure.in | 11 ++++----- sound/Makefile.am | 13 ----------- texmap/scanline.c | 10 ++++++--- video/Makefile.am | 30 ------------------------- 24 files changed, 107 insertions(+), 97 deletions(-) rename sound/dos_cdrom.c => arch/dos/cdrom.c (87%) rename sound/dos_digi.c => arch/dos/digi.c (99%) rename video/dos_gr.c => arch/dos/gr.c (98%) rename video/ggi_gr.c => arch/ggi/gr.c (97%) create mode 100644 arch/ogl/Makefile.am rename video/ogl_glx.c => arch/ogl/glx.c (97%) rename video/ogl_gr.c => arch/ogl/gr.c (98%) rename {video => arch/ogl}/ogl.c (99%) rename video/ogl_sdl.c => arch/ogl/sdlgl.c (91%) rename video/ogl_wgl.c => arch/ogl/wgl.c (98%) rename sound/sdl_cdrom.c => arch/sdl/cdrom.c (90%) rename sound/sdl_digi.c => arch/sdl/digi.c (99%) rename video/sdl_gr.c => arch/sdl/gr.c (98%) rename video/svgalib_gr.c => arch/svgalib/gr.c (97%) delete mode 100644 sound/Makefile.am delete mode 100644 video/Makefile.am diff --git a/Makefile.am b/Makefile.am index 2c61aeca..0471003c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = 2d 3d maths mem cfile iff texmap misc video sound arch main +SUBDIRS = 2d 3d maths mem cfile iff texmap misc arch main EXTRA_SUBDIRS = includes tools unused diff --git a/arch/Makefile.am b/arch/Makefile.am index 3378a183..aa3e58ab 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = @D2X_ARCH_SUBDIRS@ -DIST_SUBDIRS = dos ggi linux sdl svgalib win32 +DIST_SUBDIRS = dos ggi linux ogl sdl svgalib win32 EXTRA_SUBDIRS = include diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am index 6683c36b..9bd37a01 100644 --- a/arch/dos/Makefile.am +++ b/arch/dos/Makefile.am @@ -5,15 +5,13 @@ 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 joyc.c joydefs.c key.c mouse.c vesa.c +cdrom.c digi.c dpmi.c findfile.c init.c ipx.c joyc.c joydefs.c key.c mouse.c vesa.c SUFFIXES = .asm %.o: %.asm $(NASM) $(NASMFLAGS) $< -o $@ -if ENV_DJGPP libarch_dos_a_LIBADD = timer.o modex.o -endif EXTRA_DIST = ${EXTRA_SUBDIRS} \ tweak.inc vgaregs.inc \ diff --git a/sound/dos_cdrom.c b/arch/dos/cdrom.c similarity index 87% rename from sound/dos_cdrom.c rename to arch/dos/cdrom.c index 09d32dcf..bb94ff95 100644 --- a/sound/dos_cdrom.c +++ b/arch/dos/cdrom.c @@ -1,13 +1,16 @@ /* - * $Source: /cvs/cvsroot/d2x/sound/dos_cdrom.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/dos/cdrom.c,v $ * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:45 $ + * $Date: 2001-10-25 08:25:33 $ * * DPH: This is the file where all the stub functions go. * The aim is to have nothing in here, eventually * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/31 14:04:45 bradleyb + * Fix compiler warnings + * * Revision 1.2 2001/01/29 13:53:28 bradleyb * Fixed build, minor fixes * diff --git a/sound/dos_digi.c b/arch/dos/digi.c similarity index 99% rename from sound/dos_digi.c rename to arch/dos/digi.c index cd49172e..de558b2d 100644 --- a/sound/dos_digi.c +++ b/arch/dos/digi.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/sound/dos_digi.c,v $ + * $Source: /cvs/cvsroot/d2x/arch/dos/digi.c,v $ * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:45 $ + * $Date: 2001-10-25 08:25:33 $ * * DOS digital audio support * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/31 14:04:45 bradleyb + * Fix compiler warnings + * * Revision 1.2 2001/01/29 13:53:28 bradleyb * Fixed build, minor fixes * diff --git a/video/dos_gr.c b/arch/dos/gr.c similarity index 98% rename from video/dos_gr.c rename to arch/dos/gr.c index 72e24803..c35edd53 100644 --- a/video/dos_gr.c +++ b/arch/dos/gr.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/dos_gr.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/dos/gr.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:47:51 $ + * $Date: 2001-10-25 08:25:33 $ * * Graphics functions for DOS. * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 13:47:51 bradleyb + * Fixed build, some minor cleanups. + * */ #ifdef HAVE_CONFIG_H diff --git a/arch/ggi/Makefile.am b/arch/ggi/Makefile.am index c92183ad..43deae0d 100644 --- a/arch/ggi/Makefile.am +++ b/arch/ggi/Makefile.am @@ -2,4 +2,4 @@ EXTRA_SUBDIRS = linux noinst_LIBRARIES = libarch_ggi.a -libarch_ggi_a_SOURCES = event.c key.c mouse.c +libarch_ggi_a_SOURCES = event.c gr.c init.c key.c mouse.c diff --git a/video/ggi_gr.c b/arch/ggi/gr.c similarity index 97% rename from video/ggi_gr.c rename to arch/ggi/gr.c index c5486f95..6cafac4c 100644 --- a/video/ggi_gr.c +++ b/arch/ggi/gr.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ggi_gr.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/ggi/gr.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:47:51 $ + * $Date: 2001-10-25 08:25:34 $ * * Graphics functions for GGI. * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 13:47:51 bradleyb + * Fixed build, some minor cleanups. + * */ #ifdef HAVE_CONFIG_H diff --git a/arch/ogl/Makefile.am b/arch/ogl/Makefile.am new file mode 100644 index 00000000..faefb7ff --- /dev/null +++ b/arch/ogl/Makefile.am @@ -0,0 +1,11 @@ +noinst_LIBRARIES = libarch_ogl.a + +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include + +CFLAGS += ${SDL_CFLAGS} + +libarch_ogl_a_SOURCES = gr.c ogl.c sdlgl.c + +# Not currently used +EXTRA_DIST = \ +wgl.c glx.c diff --git a/video/ogl_glx.c b/arch/ogl/glx.c similarity index 97% rename from video/ogl_glx.c rename to arch/ogl/glx.c index a222da0a..58011d48 100644 --- a/video/ogl_glx.c +++ b/arch/ogl/glx.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ogl_glx.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/ogl/glx.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:47:52 $ + * $Date: 2001-10-25 08:25:34 $ * * opengl platform specific functions for GLX - Added 9/15/99 Matthew Mueller * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 13:47:52 bradleyb + * Fixed build, some minor cleanups. + * */ #ifdef HAVE_CONFIG_H diff --git a/video/ogl_gr.c b/arch/ogl/gr.c similarity index 98% rename from video/ogl_gr.c rename to arch/ogl/gr.c index 047003e8..b995cc4c 100644 --- a/video/ogl_gr.c +++ b/arch/ogl/gr.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ogl_gr.c,v $ - * $Revision: 1.7 $ + * $Source: /cvs/cvsroot/d2x/arch/ogl/gr.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-25 02:23:48 $ + * $Date: 2001-10-25 08:25:34 $ * * // OGL video functions. - Added 9/15/99 Matthew Mueller * * $Log: not supported by cvs2svn $ + * Revision 1.7 2001/10/25 02:23:48 bradleyb + * formatting fix + * * Revision 1.6 2001/10/18 23:59:23 bradleyb * Changed __ENV_LINUX__ to __linux__ * diff --git a/video/ogl.c b/arch/ogl/ogl.c similarity index 99% rename from video/ogl.c rename to arch/ogl/ogl.c index 089e63e8..e8cb5f05 100644 --- a/video/ogl.c +++ b/arch/ogl/ogl.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ogl.c,v $ - * $Revision: 1.7 $ + * $Source: /cvs/cvsroot/d2x/arch/ogl/ogl.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-12 00:18:40 $ + * $Date: 2001-10-25 08:25:34 $ * * Graphics support functions for OpenGL. * * $Log: not supported by cvs2svn $ + * Revision 1.7 2001/10/12 00:18:40 bradleyb + * Switched from Cygwin to mingw32 on MS boxes. Vastly improved compilability. + * * Revision 1.6 2001/10/09 03:00:08 bradleyb * opengl improvments (following d1x changes) * diff --git a/video/ogl_sdl.c b/arch/ogl/sdlgl.c similarity index 91% rename from video/ogl_sdl.c rename to arch/ogl/sdlgl.c index b20c1b8f..b92a2324 100644 --- a/video/ogl_sdl.c +++ b/arch/ogl/sdlgl.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ogl_sdl.c,v $ - * $Revision: 1.4 $ + * $Source: /cvs/cvsroot/d2x/arch/ogl/sdlgl.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-09 08:17:07 $ + * $Date: 2001-10-25 08:25:34 $ * * Graphics functions for SDL-GL. * * $Log: not supported by cvs2svn $ + * Revision 1.4 2001/10/09 08:17:07 bradleyb + * changed window caption to include version info + * * Revision 1.3 2001/10/09 02:58:20 bradleyb * Added window caption, hide mouse cursor * diff --git a/video/ogl_wgl.c b/arch/ogl/wgl.c similarity index 98% rename from video/ogl_wgl.c rename to arch/ogl/wgl.c index bdaa8c2d..134e37b3 100644 --- a/video/ogl_wgl.c +++ b/arch/ogl/wgl.c @@ -1,8 +1,8 @@ /* - * $Source: /cvs/cvsroot/d2x/video/ogl_wgl.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/ogl/wgl.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:47:52 $ + * $Date: 2001-10-25 08:25:34 $ * * opengl platform specific functions for WGL - added by Peter Hawkins * fullscreen example code courtesy of Jeff Slutter @@ -10,6 +10,9 @@ * (with some win32 help from Nirvana) * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 13:47:52 bradleyb + * Fixed build, some minor cleanups. + * */ #ifdef HAVE_CONFIG_H diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am index ea8506ef..669414c7 100644 --- a/arch/sdl/Makefile.am +++ b/arch/sdl/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/includes -I$(top_srcdir) CFLAGS += ${SDL_CFLAGS} if MINGW32 -libarch_sdl_a_SOURCES = event.c init.c joy.c joydefs.c key.c mouse.c timer.c +libarch_sdl_a_SOURCES = cdrom.c digi.c event.c init.c joy.c joydefs.c key.c mouse.c timer.c else -libarch_sdl_a_SOURCES = event.c init.c key.c mouse.c timer.c +libarch_sdl_a_SOURCES = cdrom.c digi.c event.c init.c key.c mouse.c timer.c endif diff --git a/sound/sdl_cdrom.c b/arch/sdl/cdrom.c similarity index 90% rename from sound/sdl_cdrom.c rename to arch/sdl/cdrom.c index 2187feb0..e4018678 100644 --- a/sound/sdl_cdrom.c +++ b/arch/sdl/cdrom.c @@ -1,13 +1,16 @@ /* - * $Source: /cvs/cvsroot/d2x/sound/sdl_cdrom.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/cdrom.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:53:28 $ + * $Date: 2001-10-25 08:25:34 $ * * DPH: This is the file where all the stub functions go. * The aim is to have nothing in here, eventually * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/01/29 13:53:28 bradleyb + * Fixed build, minor fixes + * */ #ifdef HAVE_CONFIG_H diff --git a/sound/sdl_digi.c b/arch/sdl/digi.c similarity index 99% rename from sound/sdl_digi.c rename to arch/sdl/digi.c index 684a6cfe..e947ea01 100644 --- a/sound/sdl_digi.c +++ b/arch/sdl/digi.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/sound/sdl_digi.c,v $ - * $Revision: 1.3 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/digi.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-12 06:36:55 $ + * $Date: 2001-10-25 08:25:34 $ * * SDL digital audio support * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/10/12 06:36:55 bradleyb + * Fix a gcc 3.0 warning, couple updates from d1x + * * Revision 1.2 2001/01/29 13:53:28 bradleyb * Fixed build, minor fixes * diff --git a/video/sdl_gr.c b/arch/sdl/gr.c similarity index 98% rename from video/sdl_gr.c rename to arch/sdl/gr.c index 779aa543..c624ffe1 100644 --- a/video/sdl_gr.c +++ b/arch/sdl/gr.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/sdl_gr.c,v $ - * $Revision: 1.5 $ + * $Source: /cvs/cvsroot/d2x/arch/sdl/gr.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-10-09 08:17:07 $ + * $Date: 2001-10-25 08:25:34 $ * * SDL video functions. * * $Log: not supported by cvs2svn $ + * Revision 1.5 2001/10/09 08:17:07 bradleyb + * changed window caption to include version info + * * Revision 1.4 2001/01/31 13:59:23 bradleyb * Fullscreen toggle added to screen res menu * diff --git a/arch/svgalib/Makefile.am b/arch/svgalib/Makefile.am index 89e2756a..e4f2668b 100644 --- a/arch/svgalib/Makefile.am +++ b/arch/svgalib/Makefile.am @@ -2,4 +2,4 @@ EXTRA_SUBDIRS = linux noinst_LIBRARIES = libarch_svgalib.a -libarch_svgalib_a_SOURCES = event.c key.c mouse.c init.c +libarch_svgalib_a_SOURCES = event.c gr.c key.c mouse.c init.c diff --git a/video/svgalib_gr.c b/arch/svgalib/gr.c similarity index 97% rename from video/svgalib_gr.c rename to arch/svgalib/gr.c index 6d092ffe..630402c3 100644 --- a/video/svgalib_gr.c +++ b/arch/svgalib/gr.c @@ -1,12 +1,15 @@ /* - * $Source: /cvs/cvsroot/d2x/video/svgalib_gr.c,v $ - * $Revision: 1.2 $ + * $Source: /cvs/cvsroot/d2x/arch/svgalib/gr.c,v $ + * $Revision: 1.1 $ * $Author: bradleyb $ - * $Date: 2001-01-29 13:47:52 $ + * $Date: 2001-10-25 08:25:34 $ * * SVGALib video functions * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/29 13:47:52 bradleyb + * Fixed build, some minor cleanups. + * */ #ifdef HAVE_CONFIG_H diff --git a/configure.in b/configure.in index a30e89c1..12ab0014 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,8 @@ AM_INIT_AUTOMAKE(d2x, 0.1.1) AM_MAINTAINER_MODE AC_PROG_INSTALL -AC_CHECK_TOOL(CC, gcc, :) +AC_PROG_CC +AC_PROG_MAKE_SET AC_ISC_POSIX AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(AR, ar, :) @@ -108,6 +109,7 @@ else done AC_DEFINE(OGL) TARGETS=d2x-ogl + D2X_ARCH_SUBDIRS="${D2X_ARCH_SUBDIRS} ogl" fi AC_SUBST(OGL_LIBS) AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes) @@ -124,7 +126,7 @@ else [AC_MSG_ERROR([GII not found, GGI version cannot be built]); ggi=false]) AC_DEFINE(GGI) TARGETS=d2x-ggi - D2X_ARCH_SUBDIRS = "${D2X_ARCH_SUBDIRS} ggi" + D2X_ARCH_SUBDIRS="${D2X_ARCH_SUBDIRS} ggi" fi AC_SUBST(GGI_LIBS) AM_CONDITIONAL(USE_GGI, test x$with_ggi = xyes) @@ -145,7 +147,7 @@ else -lvga) AC_DEFINE(SVGA) TARGETS=d2x-svga - D2X_ARCH_SUBDIRS = "${D2X_ARCH_SUBDIRS} svgalib" + D2X_ARCH_SUBDIRS="${D2X_ARCH_SUBDIRS} svgalib" fi AC_SUBST(SVGA_LIBS) AM_CONDITIONAL(USE_SVGALIB, test x$with_svga = yes) @@ -215,6 +217,7 @@ arch/Makefile arch/dos/Makefile arch/ggi/Makefile arch/linux/Makefile +arch/ogl/Makefile arch/sdl/Makefile arch/svgalib/Makefile arch/win32/Makefile @@ -225,7 +228,5 @@ main/editor/Makefile maths/Makefile mem/Makefile misc/Makefile -sound/Makefile texmap/Makefile -video/Makefile ) \ No newline at end of file diff --git a/sound/Makefile.am b/sound/Makefile.am deleted file mode 100644 index c5a84ac4..00000000 --- a/sound/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main - -CFLAGS += ${SDL_CFLAGS} - -noinst_LIBRARIES = libsound.a - -if ENV_DJGPP -libsound_a_SOURCES = dos_digi.c dos_cdrom.c -else -libsound_a_SOURCES = sdl_digi.c sdl_cdrom.c -endif - -EXTRA_libsound_a_SOURCES = sdl_digi.c sdl_cdrom.c dos_digi.c dos_cdrom.c diff --git a/texmap/scanline.c b/texmap/scanline.c index f7564a7d..19eed839 100644 --- a/texmap/scanline.c +++ b/texmap/scanline.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/texmap/scanline.c,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * $Author: bradleyb $ - * $Date: 2001-10-25 02:22:46 $ + * $Date: 2001-10-25 08:25:34 $ * * Routines to draw the texture mapped scanlines. * * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/10/25 02:22:46 bradleyb + * adding support for runtime selection of tmap funcs + * * Revision 1.2 2001/01/31 15:18:04 bradleyb * Makefile and conf.h fixes * @@ -51,7 +54,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: scanline.c,v 1.3 2001-10-25 02:22:46 bradleyb Exp $"; +static char rcsid[] = "$Id: scanline.c,v 1.4 2001-10-25 08:25:34 bradleyb Exp $"; #endif #include @@ -67,6 +70,7 @@ static char rcsid[] = "$Id: scanline.c,v 1.3 2001-10-25 02:22:46 bradleyb Exp $" #include "texmap.h" #include "texmapl.h" #include "scanline.h" +#include "strutil.h" void c_tmap_scanline_flat() { diff --git a/video/Makefile.am b/video/Makefile.am deleted file mode 100644 index 251a1a42..00000000 --- a/video/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -noinst_LIBRARIES = libvideo.a - -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include - -CFLAGS += ${SDL_CFLAGS} - -if ENV_DJGPP -libvideo_a_SOURCES = dos_gr.c -else -if USE_OPENGL -libvideo_a_SOURCES = ogl_gr.c ogl.c ogl_sdl.c -else -if USE_GGI -libvideo_a_SOURCES = ggi_gr.c -else -if USE_SVGALIB -libvideo_a_SOURCES = svgalib_gr.c -else -libvideo_a_SOURCES = sdl_gr.c -endif -endif -endif -endif - -EXTRA_libvideo_a_SOURCES = \ -dos_gr.c ogl_gr.c ogl.c ogl_sdl.c ggi_gr.c svgalib_gr.c sdl_gr.c - -# Not currently used -EXTRA_DIST = \ -ogl_wgl.c ogl_glx.c -- 2.39.2