Allow building without ogg vorbis.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2818 8092fc87-c524-0410-9efc-e669fe64eaf9
2007-07-25 19:34:31 +00:00
parent 01992b3f88
commit 67d6df6545
5 changed files with 23 additions and 4 deletions
@@ -1 +1,6 @@
-uqm_CFILES="decoder.c aiffaud.c wav.c dukaud.c modaud.c oggaud.c"
+uqm_CFILES="decoder.c aiffaud.c wav.c dukaud.c modaud.c"
+
+if [ "$uqm_OGGVORBIS" '!=' "none" ]; then
+	uqm_CFILES="$uqm_CFILES oggaud.c"
+fi
+
@@ -27,7 +27,9 @@
 #include "decoder.h"
 #include "wav.h"
 #include "dukaud.h"
-#include "modaud.h"
+#ifndef OGGVORBIS_NONE
+#	include "modaud.h"
+#endif  /* OGGVORBIS_NONE */
 #include "oggaud.h"
 #include "aiffaud.h"

@@ -132,7 +134,9 @@ static TFB_RegSoundDecoder sd_decoders[MAX_REG_DECODERS + 1] =
 {
 	{true,  true,  "wav", &wava_DecoderVtbl},
 	{true,  true,  "mod", &moda_DecoderVtbl},
+#ifndef OVCODEC_NONE
 	{true,  true,  "ogg", &ova_DecoderVtbl},
+#endif  /* OGGVORBIS_NONE */
 	{true,  true,  "duk", &duka_DecoderVtbl},
 	{true,  true,  "aif", &aifa_DecoderVtbl},
 	{false, false,  NULL, NULL}, // null term