Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-04-16 22:32:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

build_proton: Fix 32-bit ffmpeg build on macos

Browse Source
This commit is contained in:
Andrew Eikum 2018-06-26 09:06:01 -05:00
parent 13b5f764ae
commit d728001649
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_proton.sh
View File

@ -203,7 +203,9 @@ function build_ffmpeg
cd "$TOP" cd "$TOP"
mkdir -p build/ffmpeg.win32 mkdir -p build/ffmpeg.win32
cd build/ffmpeg.win32 cd build/ffmpeg.win32
$I386_WRAPPER "$TOP"/ffmpeg/configure --prefix="$TOOLS_DIR32" \ $I386_WRAPPER "$TOP"/ffmpeg/configure \
--extra-cflags="$FFMPEG_CROSS_CFLAGS" --extra-ldflags="$FFMPEG_CROSS_LDFLAGS" \
--prefix="$TOOLS_DIR32" \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--disable-programs \ --disable-programs \
@ -459,6 +461,8 @@ if [ "$PLATFORM" == "Darwin" ]; then
CMAKE32="cmake" CMAKE32="cmake"
CMAKE64="cmake" CMAKE64="cmake"
WITHOUT_X="--without-x" WITHOUT_X="--without-x"
FFMPEG_CROSS_CFLAGS="-m32"
FFMPEG_CROSS_LDFLAGS="-m32"
else else
CC="$CCACHE gcc" CC="$CCACHE gcc"
AMD64_WRAPPER="schroot --chroot steamrt_scout_beta_amd64 --" AMD64_WRAPPER="schroot --chroot steamrt_scout_beta_amd64 --"
@ -467,6 +471,8 @@ else
MAKE="make" MAKE="make"
LIB_SUFFIX="so" LIB_SUFFIX="so"
WITHOUT_X="" WITHOUT_X=""
FFMPEG_CROSS_CFLAGS=""
FFMPEG_CROSS_LDFLAGS=""
if [ -e "$HOME/opt32/bin/cmake" ]; then if [ -e "$HOME/opt32/bin/cmake" ]; then
CMAKE32="$HOME/opt32/bin/cmake" CMAKE32="$HOME/opt32/bin/cmake"