diff options
| author | Patrick Mours <pmours@nvidia.com> | 2021-04-20 15:00:05 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2021-04-20 19:45:46 +0300 |
| commit | 847579b422507917c4252ecc5c777bf5e0fc6f09 (patch) | |
| tree | 6f9def3399bd8c01cb5e45d3e0eeab0406f47cca /build_files/build_environment/cmake/x264.cmake | |
| parent | f2626f14209e574eb23f115bf84a3452bfb9a89c (diff) | |
Add support for building on Linux aarch64
Differential Revision: https://developer.blender.org/D10958
Diffstat (limited to 'build_files/build_environment/cmake/x264.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/x264.cmake | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index a32f119d184..08d698cc3ad 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -20,24 +20,16 @@ if(WIN32) set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST}) endif() - -if(APPLE) - if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") - set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm") - set(X264_CONFIGURE_ENV echo .) - else() - set(X264_CONFIGURE_ENV - export AS=${LIBDIR}/nasm/bin/nasm - ) - endif() -else() - set(X264_CONFIGURE_ENV echo .) +if(BLENDER_PLATFORM_ARM) + set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm") endif() -if(UNIX AND NOT APPLE) +if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE)) set(X264_CONFIGURE_ENV export AS=${LIBDIR}/nasm/bin/nasm ) +else() + set(X264_CONFIGURE_ENV echo .) endif() ExternalProject_Add(external_x264 |