Finished moving stuff to arch/blah. I know, it's ugly, but It'll be easier to sync...
authorBradley Bell <btb@icculus.org>
Thu, 25 Oct 2001 08:25:35 +0000 (08:25 +0000)
committerBradley Bell <btb@icculus.org>
Thu, 25 Oct 2001 08:25:35 +0000 (08:25 +0000)
24 files changed:
Makefile.am
arch/Makefile.am
arch/dos/Makefile.am
arch/dos/cdrom.c [moved from sound/dos_cdrom.c with 87% similarity]
arch/dos/digi.c [moved from sound/dos_digi.c with 99% similarity]
arch/dos/gr.c [moved from video/dos_gr.c with 98% similarity]
arch/ggi/Makefile.am
arch/ggi/gr.c [moved from video/ggi_gr.c with 97% similarity]
arch/ogl/Makefile.am [new file with mode: 0644]
arch/ogl/glx.c [moved from video/ogl_glx.c with 97% similarity]
arch/ogl/gr.c [moved from video/ogl_gr.c with 98% similarity]
arch/ogl/ogl.c [moved from video/ogl.c with 99% similarity]
arch/ogl/sdlgl.c [moved from video/ogl_sdl.c with 91% similarity]
arch/ogl/wgl.c [moved from video/ogl_wgl.c with 98% similarity]
arch/sdl/Makefile.am
arch/sdl/cdrom.c [moved from sound/sdl_cdrom.c with 90% similarity]
arch/sdl/digi.c [moved from sound/sdl_digi.c with 99% similarity]
arch/sdl/gr.c [moved from video/sdl_gr.c with 98% similarity]
arch/svgalib/Makefile.am
arch/svgalib/gr.c [moved from video/svgalib_gr.c with 97% similarity]
configure.in
sound/Makefile.am [deleted file]
texmap/scanline.c
video/Makefile.am [deleted file]

index 2c61aec..0471003 100644 (file)
@@ -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
 
index 3378a18..aa3e58a 100644 (file)
@@ -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
 
index 6683c36..9bd37a0 100644 (file)
@@ -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 \
similarity index 87%
rename from sound/dos_cdrom.c
rename to arch/dos/cdrom.c
index 09d32dc..bb94ff9 100644 (file)
@@ -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
  *
similarity index 99%
rename from sound/dos_digi.c
rename to arch/dos/digi.c
index cd49172..de558b2 100644 (file)
@@ -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
  *
similarity index 98%
rename from video/dos_gr.c
rename to arch/dos/gr.c
index 72e2480..c35edd5 100644 (file)
@@ -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
index c92183a..43deae0 100644 (file)
@@ -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
similarity index 97%
rename from video/ggi_gr.c
rename to arch/ggi/gr.c
index c5486f9..6cafac4 100644 (file)
@@ -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 (file)
index 0000000..faefb7f
--- /dev/null
@@ -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
similarity index 97%
rename from video/ogl_glx.c
rename to arch/ogl/glx.c
index a222da0..58011d4 100644 (file)
@@ -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
similarity index 98%
rename from video/ogl_gr.c
rename to arch/ogl/gr.c
index 047003e..b995cc4 100644 (file)
@@ -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__
  *
similarity index 99%
rename from video/ogl.c
rename to arch/ogl/ogl.c
index 089e63e..e8cb5f0 100644 (file)
@@ -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)
  *
similarity index 91%
rename from video/ogl_sdl.c
rename to arch/ogl/sdlgl.c
index b20c1b8..b92a232 100644 (file)
@@ -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
  *
similarity index 98%
rename from video/ogl_wgl.c
rename to arch/ogl/wgl.c
index bdaa8c2..134e37b 100644 (file)
@@ -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
index ea8506e..669414c 100644 (file)
@@ -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
similarity index 90%
rename from sound/sdl_cdrom.c
rename to arch/sdl/cdrom.c
index 2187feb..e401867 100644 (file)
@@ -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
similarity index 99%
rename from sound/sdl_digi.c
rename to arch/sdl/digi.c
index 684a6cf..e947ea0 100644 (file)
@@ -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
  *
similarity index 98%
rename from video/sdl_gr.c
rename to arch/sdl/gr.c
index 779aa54..c624ffe 100644 (file)
@@ -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
  *
index 89e2756..e4f2668 100644 (file)
@@ -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
similarity index 97%
rename from video/svgalib_gr.c
rename to arch/svgalib/gr.c
index 6d092ff..630402c 100644 (file)
@@ -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
index a30e89c..12ab001 100644 (file)
@@ -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 (file)
index c5a84ac..0000000
+++ /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
index f7564a7..19eed83 100644 (file)
@@ -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 <math.h>
@@ -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 (file)
index 251a1a4..0000000
+++ /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