[Android] [PATCH 7/7] contrib: ffmpeg: Add --arch=x86 if compiling to x86

[Rafaël Carré]

I assume no problem on normal Linux builds?

Le 2012-07-23 05:54, Edward Wang a écrit :
> ---
>  contrib/src/ffmpeg/rules.mak   |    5 +++++
>  contrib/src/postproc/rules.mak |    5 +++++
>  2 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
> index c36bd7c..3eb3053 100644
> --- a/contrib/src/ffmpeg/rules.mak
> +++ b/contrib/src/ffmpeg/rules.mak
> @@ -61,6 +61,11 @@ FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
>  endif
>  endif
>  
> +# x86 stuff
> +ifeq ($(ARCH),i386)
> +FFMPEGCONF += --arch=x86
> +endif
> +
>  # Darwin
>  ifdef HAVE_DARWIN_OS
>  FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
> diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
> index 518865d..6c010bf 100644
> --- a/contrib/src/postproc/rules.mak
> +++ b/contrib/src/postproc/rules.mak
> @@ -30,6 +30,11 @@ POSTPROC_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
>  endif
>  endif
>  
> +# x86 stuff
> +ifeq ($(ARCH),i386)
> +POSTPROCCONF += --arch=x86
> +endif
> +
>  # Darwin
>  ifdef HAVE_DARWIN_OS
>  POSTPROCCONF += --arch=$(ARCH) --target-os=darwin
>