aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMax Horn2011-06-01 23:17:43 +0200
committerMax Horn2011-06-01 23:17:43 +0200
commit9db33ea544afd2c24857b8229e97e532881383ca (patch)
tree480f71d87099e055e0aed580c86d868a5ba11465 /configure
parent5eae0e1a5c35c4c8453b90d6fa7230c9e51ede6a (diff)
downloadscummvm-rg350-9db33ea544afd2c24857b8229e97e532881383ca.tar.gz
scummvm-rg350-9db33ea544afd2c24857b8229e97e532881383ca.tar.bz2
scummvm-rg350-9db33ea544afd2c24857b8229e97e532881383ca.zip
ALL: Removed last traces of the MPEG2 code
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure53
1 files changed, 0 insertions, 53 deletions
diff --git a/configure b/configure
index 9bb1e113e0..5d5d6d0c02 100755
--- a/configure
+++ b/configure
@@ -130,7 +130,6 @@ _alsa=auto
_seq_midi=auto
_timidity=auto
_zlib=auto
-_mpeg2=no
_png=auto
_theoradec=auto
_faad=auto
@@ -746,9 +745,6 @@ Optional Libraries:
--with-zlib-prefix=DIR Prefix where zlib is installed (optional)
--disable-zlib disable zlib (compression) support [autodetect]
- --with-mpeg2-prefix=DIR Prefix where libmpeg2 is installed (optional)
- --enable-mpeg2 enable mpeg2 codec for cutscenes [no]
-
--with-opengl-prefix=DIR Prefix where OpenGL (ES) is installed (optional)
--disable-opengl disable OpenGL (ES) support [autodetect]
@@ -812,7 +808,6 @@ for ac_option in $@; do
--disable-zlib) _zlib=no ;;
--enable-nasm) _nasm=yes ;;
--disable-nasm) _nasm=no ;;
- --enable-mpeg2) _mpeg2=yes ;;
--disable-png) _png=no ;;
--enable-png) _png=yes ;;
--disable-theoradec) _theoradec=no ;;
@@ -842,11 +837,6 @@ for ac_option in $@; do
FLUIDSYNTH_CFLAGS="-I$arg/include"
FLUIDSYNTH_LIBS="-L$arg/lib"
;;
- --with-mpeg2-prefix=*)
- arg=`echo $ac_option | cut -d '=' -f 2`
- MPEG2_CFLAGS="-I$arg/include"
- MPEG2_LIBS="-L$arg/lib"
- ;;
--with-alsa-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
ALSA_CFLAGS="-I$arg/include"
@@ -2872,49 +2862,6 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then
fi
#
-# Check for LibMPEG2
-#
-echocheck "libmpeg2 >= 0.3.2"
-if test "$_mpeg2" = auto ; then
- _mpeg2=no
- cat > $TMPC << EOF
-typedef signed $type_1_byte int8_t;
-typedef signed $type_2_byte int16_t;
-typedef signed $type_4_byte int32_t;
-
-typedef unsigned $type_1_byte uint8_t;
-typedef unsigned $type_2_byte uint16_t;
-typedef unsigned $type_4_byte uint32_t;
-
-#include <mpeg2dec/mpeg2.h>
-int main(void) {
- /* mpeg2_state_t first appears in 0.4.0 */
- mpeg2_state_t state;
-
- #ifdef MPEG2_RELEASE
- if (MPEG2_RELEASE >= MPEG2_VERSION(0, 3, 2))
- return 0;
- #endif
- return 1;
-}
-EOF
-
- if test -n "$_host"; then
- # don't execute while cross compiling
- cc_check $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && _mpeg2=yes
- else
- cc_check_no_clean $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && $TMPO$HOSTEXEEXT && _mpeg2=yes
- cc_check_clean
- fi
-fi
-if test "$_mpeg2" = yes ; then
- INCLUDES="$INCLUDES $MPEG2_CFLAGS"
- LIBS="$LIBS $MPEG2_LIBS -lmpeg2"
-fi
-define_in_config_if_yes "$_mpeg2" 'USE_MPEG2'
-echo "$_mpeg2"
-
-#
# Check for libfluidsynth
#
echocheck "libfluidsynth"