diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-07-07 12:16:31 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-07-07 17:26:47 +0300 |
commit | d352902758f41d69948f57a55934d7456f6ebb38 (patch) | |
tree | 4a1cec91de898ed0d0b5500a2aa3f009b8382c32 /build_files/build_environment/cmake/x264.cmake | |
parent | 1e3c0b4b03e1b1f6a2a66539e7648a5b92fada91 (diff) |
Make deps: Use own nasm for ffmpeg and x264
Fixes the warning: building for macOS, but linking in object file
Differential Revision: https://developer.blender.org/D8235
Diffstat (limited to 'build_files/build_environment/cmake/x264.cmake')
-rw-r--r-- | build_files/build_environment/cmake/x264.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index 62a46254a99..96bf031ce83 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -21,12 +21,21 @@ if(WIN32) endif() +if(APPLE) + set(X264_CONFIGURE_ENV + export AS=${LIBDIR}/nasm/bin/nasm + ) +else() + set(X264_CONFIGURE_ENV echo .) +endif() + ExternalProject_Add(external_x264 URL ${X264_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH SHA256=${X264_HASH} PREFIX ${BUILD_DIR}/x264 - CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264 + CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && + ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264 --enable-static --enable-pic --disable-lavf |