Merge branch 'blender-v4.5-release'

2025-06-04 16:14:05 +02:00
parent d9c7118983 2c948b873e
commit e79fcb4f56
1 changed files with 1 additions and 1 deletions
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -6,7 +6,7 @@ if(WIN32)
  set(X264_EXTRA_ARGS --enable-win32thread)
 endif()

-if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE))
+if(UNIX AND NOT BLENDER_PLATFORM_ARM)
  set(X264_CONFIGURE_ENV ${CONFIGURE_ENV} &&
    export AS=${LIBDIR}/nasm/bin/nasm
  )