Commit: da01237d36ca6f46937da900d4901ed91611f314
Author: Brecht Van Lommel
Date: Mon Nov 28 16:27:54 2022 +0100
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBda01237d36ca6f46937da900d4901ed91611f314
Fix libsndlib picking up system libopus
Build against our own instead.
===================================================================
M build_files/build_environment/cmake/sndfile.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/sndfile.cmake
b/build_files/build_environment/cmake/sndfile.cmake
index a2ac2a33779..1e4249e7e53 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(SNDFILE_EXTRA_ARGS)
-set(SNDFILE_ENV
PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
+set(SNDFILE_ENV
PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR})
if(WIN32)
set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
@@ -30,6 +30,7 @@ add_dependencies(
external_sndfile
external_ogg
external_vorbis
+ external_opus
)
if(UNIX)
add_dependencies(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
