[Bf-blender-cvs] [19a62203089] master: Fix link errors after recent FFMPEG / link_directories changes

[Brecht Van Lommel]

Commit: 19a62203089ffa3e8866a1989aefef7774744aca
Author: Brecht Van Lommel
Date:   Thu Jan 13 11:12:56 2022 +0100
Branches: master
https://developer.blender.org/rB19a62203089ffa3e8866a1989aefef7774744aca

Fix link errors after recent FFMPEG / link_directories changes

===================================================================

M	build_files/cmake/platform/platform_unix.cmake
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index dce78fb0c8e..317ea0af4ae 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -179,13 +179,19 @@ endif()
 if(WITH_CODEC_FFMPEG)
   if(EXISTS ${LIBDIR})
     set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
-    # Override FFMPEG components to also include static library dependencies.
-    # included with precompiled libraries.
+    # Override FFMPEG components to also include static library dependencies
+    # included with precompiled libraries, and to ensure correct link order.
     set(FFMPEG_FIND_COMPONENTS
-      avcodec avdevice avformat avutil
-      mp3lame ogg opus swresample swscale
-      theora theoradec theoraenc vorbis vorbisenc
-      vorbisfile vpx x264 xvidcore)
+      avformat avcodec avdevice avutil swresample swscale
+      sndfile
+      FLAC
+      mp3lame
+      opus
+      theora theoradec theoraenc
+      vorbis vorbisenc vorbisfile ogg
+      vpx
+      x264
+      xvidcore)
   elseif(FFMPEG)
     # Old cache variable used for root dir, convert to new standard.
     set(FFMPEG_ROOT_DIR ${FFMPEG})
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7e657abd937..a5d20e1fa37 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -71,6 +71,10 @@ endif()
 
 if(WITH_TBB)
   blender_include_dirs(${TBB_INCLUDE_DIRS})
+  if(WIN32)
+    # For pragma that links tbbmalloc_proxy.lib
+    link_directories(${LIBDIR}/tbb/lib)
+  endif()
 endif()