diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2001-08-30 17:15:31 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2001-08-30 17:15:31 +0000 |
| commit | 2eba06768d93a4e0a29b31772f0bcb446eebf7b9 (patch) | |
| tree | cce46e4da825f0c9f52a1853d5a29f1d7e21dcc3 | |
| parent | ce43ee78dabd0d05e4912551b3fe97e13dee15fe (diff) | |
| download | xine-lib-2eba06768d93a4e0a29b31772f0bcb446eebf7b9.tar.gz xine-lib-2eba06768d93a4e0a29b31772f0bcb446eebf7b9.tar.bz2 | |
Enable mediaLib usage in libac52
CVS patchset: 524
CVS date: 2001/08/30 17:15:31
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/liba52/Makefile.am | 4 | ||||
| -rw-r--r-- | src/liba52/imdct.c | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/acconfig.h b/acconfig.h index d1dbcfac7..11294c308 100644 --- a/acconfig.h +++ b/acconfig.h @@ -26,6 +26,9 @@ /* Define this if you have mlib installed */ #undef LIBMPEG2_MLIB +/* Define this if you have mlib installed */ +#undef LIBA52_MLIB + /* Define this if you have getpwuid_r() function */ #undef HAVE_GETPWUID_R diff --git a/configure.in b/configure.in index 2577a400e..c4d536bff 100644 --- a/configure.in +++ b/configure.in @@ -128,8 +128,10 @@ dnl mpeg2lib stuff dnl AC_SUBST(LIBMPEG2_CFLAGS) AC_SUBST(LIBMPEG2_CONFIG_OBJS) +AC_SUBST(LIBA52_CFLAGS) LIBMPEG2_CFLAGS="" dnl default include path removed, no more needed. +LIBA52_CFLAGS="" if test x$enable_mlib = x; then AC_ARG_ENABLE(mlib, @@ -141,8 +143,10 @@ if test x$enable_mlib = xyes; then [ LIBS="$LIBS -L/opt/SUNWmlib/lib -lmlib" LIBMPEG2_CONFIG_OBJS="$LIBMPEG2_CONFIG_OBJS idct_mlib.lo motion_comp_mlib.lo" LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -I/opt/SUNWmlib/include" + LIBA52_CFLAGS="$LIBA52_CFLAGS -I/opt/SUNWmlib/include" AC_DEFINE(HAVE_MLIB) - AC_DEFINE(LIBMPEG2_MLIB)], + AC_DEFINE(LIBMPEG2_MLIB) + AC_DEFINE(LIBA52_MLIB)], , -L/opt/SUNWmlib/lib) fi @@ -457,8 +461,7 @@ case $host in cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;; sparc64-*) - #cpu_cflags="-mcpu=v9 -mtune=ultrasparc" - cpu_cflags="-mcpu=v8 -mtune=ultrasparc" + cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc" ;; esac GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions" @@ -476,8 +479,7 @@ case $host in cpu_cflags="-mcpu=v8 -mtune=supersparc" ;; sun4u) - #cpu_cflags="-mcpu=v9 -mtune=ultrasparc" - cpu_cflags="-mcpu=v8 -mtune=ultrasparc" + cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc" ;; esac GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions" diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 78ea2055f..81e457c54 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,4 +1,6 @@ -CFLAGS = @GLOBAL_CFLAGS@ +CFLAGS = @LIBA52_CFLAGS@ @GLOBAL_CFLAGS@ +DEBUG_CFLAGS = @LIBA52_CFLAGS@ @DEBUG_CFLAGS@ + LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic diff --git a/src/liba52/imdct.c b/src/liba52/imdct.c index 726cda973..3e592a27a 100644 --- a/src/liba52/imdct.c +++ b/src/liba52/imdct.c @@ -24,6 +24,8 @@ #include <inttypes.h> #include <math.h> +#include <cpu_accel.h> + #include "a52.h" #include "a52_internal.h" |