Commit: 3311e29b729432ef017d170e45e13c5455e2c453
Author: Ray Molenkamp
Date: Sat Aug 25 19:37:30 2018 -0600
Branches: master
https://developer.blender.org/rB3311e29b729432ef017d170e45e13c5455e2c453
build_environment: ffmpeg support x86 builds on windows.
===================================================================
M build_files/build_environment/cmake/ffmpeg.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake
b/build_files/build_environment/cmake/ffmpeg.cmake
index b1e69b794df..b0c76175508 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -38,6 +38,12 @@ if(WIN32)
--disable-pthreads
--enable-libopenjpeg
)
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+ set(FFMPEG_EXTRA_FLAGS
+ ${FFMPEG_EXTRA_FLAGS}
+ --x86asmexe=yasm
+ )
+ endif()
else()
set(FFMPEG_EXTRA_FLAGS
${FFMPEG_EXTRA_FLAGS}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
