actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: Don't force x86 on non-Windows; fix more attribs; don't need prefix

Browse Source
This commit is contained in:
Ben "root" Anderson
2014-02-09 20:13:42 -06:00
parent c0d13c07b1
commit 3b4f884be0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle/ffmpeg/version.sh
Regular → Executable
View File
configure.ac
+2 -2
View File
@@ -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"