From 3b4f884be068b79dc05716d08e09d19734bcbc78 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Sun, 9 Feb 2014 20:13:42 -0600 Subject: [PATCH] ffmpeg: Don't force x86 on non-Windows; fix more attribs; don't need prefix --- bundle/ffmpeg/version.sh | 0 configure.ac | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 bundle/ffmpeg/version.sh diff --git a/bundle/ffmpeg/version.sh b/bundle/ffmpeg/version.sh old mode 100644 new mode 100755 diff --git a/configure.ac b/configure.ac index 8b8b72413d..a1a2f90a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -23,13 +23,13 @@ test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="-Wall -W -Wno-unused-parameter -Wno-sw test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="-Wall -W -Wno-unused-parameter -Wno-switch" test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS="" -FFMPEG_CONFFLAGS="--prefix=../out/ --enable-gpl --disable-static --enable-shared --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter --arch=x86 --cpu=i686" +FFMPEG_CONFFLAGS="--enable-gpl --disable-static --enable-shared --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter" # If on Windows, grab the prebuilts if test "$host_os" = "mingw32"; then CPPFLAGS="$CPPFLAGS -I$PWD/extern/for_mingw/include" LDFLAGS="$LDFLAGS -L$PWD/extern/for_mingw/lib" - FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --yasmexe=../yasm-1.2.0-win32.exe" + FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --yasmexe=../yasm-1.2.0-win32.exe --arch=x86" # HACK: The prebuilts are 32bit only. Force the issue. CFLAGS="$CFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32"