From 7ab08187b304ed14089ad83cad937cc7d44495a9 Mon Sep 17 00:00:00 2001 From: David McPaul Date: Sat, 11 Apr 2009 06:30:53 +0000 Subject: [PATCH] correct avcodec build git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30113 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/avcodec/Jamfile | 1 + src/add-ons/media/plugins/avcodec/libavcodec/Jamfile | 3 --- src/add-ons/media/plugins/avcodec/libavcodec/config.h | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/add-ons/media/plugins/avcodec/Jamfile b/src/add-ons/media/plugins/avcodec/Jamfile index 2f4e00bde8..7b2683e375 100644 --- a/src/add-ons/media/plugins/avcodec/Jamfile +++ b/src/add-ons/media/plugins/avcodec/Jamfile @@ -17,6 +17,7 @@ Addon avcodec : gfx_util.cpp : libavcodec.a + libavcodec_x86.a libavutil.a libswscale.a be diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile index 67ae365a1f..d9451f018f 100644 --- a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile +++ b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile @@ -39,7 +39,6 @@ local libavcodecSourcesX86 = vp3dsp_sse2.c vp6dsp_mmx.c vp6dsp_sse2.c - fft_sse.c fdct_mmx.c ; @@ -313,6 +312,4 @@ StaticLibrary libavcodec.a : xl.c xsubdec.c zmbv.c - : -# libavcodec_x86.a ; diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/config.h b/src/add-ons/media/plugins/avcodec/libavcodec/config.h index 1a0ed384da..68b1853b5a 100644 --- a/src/add-ons/media/plugins/avcodec/libavcodec/config.h +++ b/src/add-ons/media/plugins/avcodec/libavcodec/config.h @@ -27,12 +27,12 @@ #define HAVE_ARMVFP 0 #define HAVE_IWMMXT 0 #define HAVE_MMI 0 -#define HAVE_MMX 0 -#define HAVE_MMX2 0 +#define HAVE_MMX 1 +#define HAVE_MMX2 1 #define HAVE_NEON 0 #define HAVE_PPC4XX 0 -#define HAVE_SSE 0 -#define HAVE_SSSE3 0 +#define HAVE_SSE 1 +#define HAVE_SSSE3 1 #define HAVE_VIS 0 #define HAVE_BEOSTHREADS 0 #define HAVE_OS2THREADS 0