Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-08-26 04:37:30 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-26 04:37:30 +0300
commit3311e29b729432ef017d170e45e13c5455e2c453 (patch)
treeb932ea77039a25612b210b368a845b6265a62266 /build_files
parentb6edf860fe2aab445c381ccc84d73c65a4d9faa5 (diff)
build_environment: ffmpeg support x86 builds on windows.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/ffmpeg.cmake6
1 files changed, 6 insertions, 0 deletions
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}