From 5ceb6c6deb4535bdf7a8293b8bcd403f68f058e8 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 18 Feb 2003 07:37:19 +0000 Subject: [PATCH] moved mve stuff to separate subdir --- Makefile.am | 4 ++-- README.utils | 2 +- configure.ac | 1 + main/mveplay.h => include/libmve.h | 0 libmve/Makefile.am | 15 +++++++++++++++ {main => libmve}/decoder16.c | 0 {main => libmve}/decoder8.c | 0 {main => libmve}/mve_audio.c | 0 {include => libmve}/mve_audio.h | 0 {main => libmve}/mve_main.c | 0 {main => libmve}/mvelib.c | 0 {include => libmve}/mvelib.h | 0 {main => libmve}/mveplay.c | 4 ++-- main/Makefile.am | 15 ++++----------- main/movie.c | 6 +++--- 15 files changed, 28 insertions(+), 19 deletions(-) rename main/mveplay.h => include/libmve.h (100%) create mode 100644 libmve/Makefile.am rename {main => libmve}/decoder16.c (100%) rename {main => libmve}/decoder8.c (100%) rename {main => libmve}/mve_audio.c (100%) rename {include => libmve}/mve_audio.h (100%) rename {main => libmve}/mve_main.c (100%) rename {main => libmve}/mvelib.c (100%) rename {include => libmve}/mvelib.h (100%) rename {main => libmve}/mveplay.c (99%) diff --git a/Makefile.am b/Makefile.am index cd3389af..200646d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/README.utils b/README.utils index 50e6bcae..23eac6aa 100644 --- a/README.utils +++ b/README.utils @@ -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 diff --git a/configure.ac b/configure.ac index 1e387473..a56c2d37 100644 --- a/configure.ac +++ b/configure.ac @@ -349,6 +349,7 @@ AC_OUTPUT( arch/win32/Makefile cfile/Makefile iff/Makefile + libmve/Makefile main/Makefile main/editor/Makefile maths/Makefile diff --git a/main/mveplay.h b/include/libmve.h 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 index 00000000..33d6d3e5 --- /dev/null +++ b/libmve/Makefile.am @@ -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 diff --git a/main/decoder16.c b/libmve/decoder16.c similarity index 100% rename from main/decoder16.c rename to libmve/decoder16.c diff --git a/main/decoder8.c b/libmve/decoder8.c similarity index 100% rename from main/decoder8.c rename to libmve/decoder8.c diff --git a/main/mve_audio.c b/libmve/mve_audio.c similarity index 100% rename from main/mve_audio.c rename to libmve/mve_audio.c diff --git a/include/mve_audio.h b/libmve/mve_audio.h similarity index 100% rename from include/mve_audio.h rename to libmve/mve_audio.h diff --git a/main/mve_main.c b/libmve/mve_main.c similarity index 100% rename from main/mve_main.c rename to libmve/mve_main.c diff --git a/main/mvelib.c b/libmve/mvelib.c similarity index 100% rename from main/mvelib.c rename to libmve/mvelib.c diff --git a/include/mvelib.h b/libmve/mvelib.h similarity index 100% rename from include/mvelib.h rename to libmve/mvelib.h diff --git a/main/mveplay.c b/libmve/mveplay.c similarity index 99% rename from main/mveplay.c rename to libmve/mveplay.c index 19baa716..e0bc7e62 100644 --- a/main/mveplay.c +++ b/libmve/mveplay.c @@ -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 #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" diff --git a/main/Makefile.am b/main/Makefile.am index c2f93a1e..8f07810b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -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 diff --git a/main/movie.c b/main/movie.c index d854d81a..01075ba6 100644 --- a/main/movie.c +++ b/main/movie.c @@ -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" -- 2.39.2