moved mve stuff to separate subdir
authorBradley Bell <btb@icculus.org>
Tue, 18 Feb 2003 07:37:19 +0000 (07:37 +0000)
committerBradley Bell <btb@icculus.org>
Tue, 18 Feb 2003 07:37:19 +0000 (07:37 +0000)
15 files changed:
Makefile.am
README.utils
configure.ac
include/libmve.h [moved from main/mveplay.h with 100% similarity]
libmve/Makefile.am [new file with mode: 0644]
libmve/decoder16.c [moved from main/decoder16.c with 100% similarity]
libmve/decoder8.c [moved from main/decoder8.c with 100% similarity]
libmve/mve_audio.c [moved from main/mve_audio.c with 100% similarity]
libmve/mve_audio.h [moved from include/mve_audio.h with 100% similarity]
libmve/mve_main.c [moved from main/mve_main.c with 100% similarity]
libmve/mvelib.c [moved from main/mvelib.c with 100% similarity]
libmve/mvelib.h [moved from include/mvelib.h with 100% similarity]
libmve/mveplay.c [moved from main/mveplay.c with 99% similarity]
main/Makefile.am
main/movie.c

index cd3389a..200646d 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = 2d 3d maths mem cfile iff texmap misc arch main
+SUBDIRS = 2d 3d maths mem cfile iff texmap misc arch main libmve
 
 EXTRA_SUBDIRS = include tools unused debian rpm utilities
 
@@ -22,7 +22,7 @@ d2x_gl_SOURCES =
 d2x_svga_SOURCES =
 d2x_ggi_SOURCES =
 
-d2x_LDADD = ${LD_KLUDGE} main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${ARCH_LIBS} mem/libmem.a cfile/libcfile.a iff/libiff.a texmap/libtexmap.a misc/libmisc.a maths/libmaths.a
+d2x_LDADD = ${LD_KLUDGE} main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${ARCH_LIBS} libmve/libmve.a mem/libmem.a cfile/libcfile.a iff/libiff.a texmap/libtexmap.a misc/libmisc.a maths/libmaths.a
 
 if MINGW32
 if USE_NETWORK
index 50e6bca..23eac6a 100644 (file)
@@ -10,7 +10,7 @@ version of Descent II are not really mve files.  They appear to be
 some sort of quicktime-related format.
 
 To build mveplayer, configure the source tree as normal, then execute
-"make mveplayer" from within the main subdirectory.
+"make mveplayer" from within the libmve subdirectory.
 
 
 hogcreate
index 1e38747..a56c2d3 100644 (file)
@@ -349,6 +349,7 @@ AC_OUTPUT(
     arch/win32/Makefile
     cfile/Makefile
     iff/Makefile
+    libmve/Makefile
     main/Makefile
     main/editor/Makefile
     maths/Makefile
similarity index 100%
rename from main/mveplay.h
rename to include/libmve.h
diff --git a/libmve/Makefile.am b/libmve/Makefile.am
new file mode 100644 (file)
index 0000000..33d6d3e
--- /dev/null
@@ -0,0 +1,15 @@
+EXTRA_PROGRAMS = mveplayer
+
+mveplayer_SOURCES = decoder16.c decoder8.c mve_audio.c mve_main.c mvelib.c mveplay.c
+
+mveplayer_CFLAGS = -DSTANDALONE
+
+
+
+noinst_LIBRARIES = libmve.a
+
+INCLUDES = -I$(top_srcdir)/include
+
+libmve_a_SOURCES = decoder16.c decoder8.c mve_audio.c mvelib.c mveplay.c
+
+EXTRA_DIST = mve_audio.h mvelib.h
similarity index 100%
rename from main/decoder16.c
rename to libmve/decoder16.c
similarity index 100%
rename from main/decoder8.c
rename to libmve/decoder8.c
similarity index 100%
rename from main/mve_audio.c
rename to libmve/mve_audio.c
similarity index 100%
rename from include/mve_audio.h
rename to libmve/mve_audio.h
similarity index 100%
rename from main/mve_main.c
rename to libmve/mve_main.c
similarity index 100%
rename from main/mvelib.c
rename to libmve/mvelib.c
similarity index 100%
rename from include/mvelib.h
rename to libmve/mvelib.h
similarity index 99%
rename from main/mveplay.c
rename to libmve/mveplay.c
index 19baa71..e0bc7e6 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: mveplay.c,v 1.16 2003-02-18 07:05:14 btb Exp $ */
+/* $Id: mveplay.c,v 1.1 2003-02-18 07:37:19 btb Exp $ */
 #ifdef HAVE_CONFIG_H
 #include <conf.h>
 #endif
@@ -25,7 +25,7 @@
 #include "mve_audio.h"
 
 #ifndef STANDALONE
-#include "mveplay.h"
+#include "libmve.h"
 #include "error.h"
 #include "u_mem.h"
 #include "gr.h"
index c2f93a1..8f07810 100644 (file)
@@ -4,12 +4,6 @@ DIST_SUBDIRS = editor
 
 EXTRA_SUBDIRS = old
 
-EXTRA_PROGRAMS = mveplayer
-
-mveplayer_SOURCES = decoder16.c decoder8.c mve_audio.c mve_main.c mvelib.c mveplay.c
-
-mveplayer_CFLAGS = -DSTANDALONE
-
 noinst_LIBRARIES = libmain.a
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include
@@ -25,15 +19,14 @@ endif
 libmain_a_SOURCES = ${EDITOR_SRCS} ${NETWORK_SRCS} \
 ai.c        ai2.c       aipath.c    automap.c   bm.c        \
 cmd.c       cntrlcen.c  collide.c   config.c    console.c   \
-controls.c  credits.c   crypt.c     decoder16.c decoder8.c  \
-effects.c   endlevel.c  \
+controls.c  credits.c   crypt.c     effects.c   endlevel.c  \
 escort.c    fireball.c  fuelcen.c   fvi.c       game.c      \
 gamecntl.c  gamefont.c  gamemine.c  gamepal.c   gamerend.c  \
 gamesave.c  gameseg.c   gameseq.c   gauges.c    hoard.c     \
 hostage.c   \
 hud.c       inferno.c   kconfig.c   kludge.c    laser.c     \
 lighting.c  menu.c      mglobal.c   mission.c   morph.c     \
-movie.c     mvelib.c    mve_audio.c mveplay.c   \
+movie.c     \
 newdemo.c   newmenu.c   object.c    paging.c    physics.c   \
 piggy.c     player.c    playsave.c  polyobj.c   powerup.c   \
 render.c    robot.c     scores.c    segment.c   slew.c      \
@@ -53,9 +46,9 @@ endlevel.h fireball.h fuelcen.h fvi.h fvi_a.h game.h gamefont.h gamemine.h \
 gamepal.h gamesave.h gameseg.h gameseq.h gamestat.h gauges.h hoard.h \
 hostage.h hudmsg.h inferno.h joydefs.h kconfig.h \
 kmatrix.h laser.h lighting.h menu.h mission.h modem.h morph.h movie.h multi.h \
-multibot.h mveplay.h netmisc.h network.h newdemo.h newmenu.h \
+multibot.h netmisc.h network.h newdemo.h newmenu.h \
 object.h paging.h physics.h piggy.h player.h playsave.h polyobj.h powerup.h \
 render.h reorder.h robot.h scores.h screens.h segment.h segpoint.h slew.h \
 songs.h sounds.h state.h switch.h terrain.h texmerge.h text.h textures.h \
 titles.h vclip.h vers_id.h wall.h weapon.h \
-dumpmine.c mve_main.c
+dumpmine.c
index d854d81..01075ba 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: movie.c,v 1.17 2003-02-18 07:05:14 btb Exp $ */
+/* $Id: movie.c,v 1.18 2003-02-18 07:37:19 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: movie.c,v 1.17 2003-02-18 07:05:14 btb Exp $";
+static char rcsid[] = "$Id: movie.c,v 1.18 2003-02-18 07:37:19 btb Exp $";
 #endif
 
 #define DEBUG_LEVEL CON_NORMAL
@@ -45,7 +45,7 @@ static char rcsid[] = "$Id: movie.c,v 1.17 2003-02-18 07:05:14 btb Exp $";
 #include "gamefont.h"
 #include "cfile.h"
 #include "menu.h"
-#include "mveplay.h"
+#include "libmve.h"
 #include "text.h"
 #include "fileutil.h"