diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 13:12:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 13:12:56 +0300 |
| commit | 19a62203089ffa3e8866a1989aefef7774744aca (patch) | |
| tree | e2ca9fc7efa225653f63dae22c3d64600e7d5281 | |
| parent | d53738396f45e76c1e486f0f5829196ec5903072 (diff) | |
Fix link errors after recent FFMPEG / link_directories changes
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 18 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 |
2 files changed, 16 insertions, 6 deletions
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() |