diff --git a/ThirdParty/flac/README.md b/ThirdParty/flac/README.md index aa1e0aaf1..c51d534ab 100644 --- a/ThirdParty/flac/README.md +++ b/ThirdParty/flac/README.md @@ -1,18 +1,20 @@ Build with CMake, using the following options: ``` -cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" -DBUILD_SHARED_LIBS=ON +cmake build-x86 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" -DBUILD_SHARED_LIBS=ON +cmake build-arm -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" -DBUILD_SHARED_LIBS=ON ``` + And some minor tweaks with `install_name_tool -id` to make sure that the resulting libFLAC.8.dylib referred to itself with @rpath and not full -paths of the build directory. +paths of the build directory, and imported libogg.0.dylib with an @rpath. -Version v1.3.1-101-g66d060c7 was used from the following repository: +Version 1.3.4-0-g1151c93e was used from the following repository: https://github.com/xiph/flac.git A single patch was used, and is included. Affects x86_64, but not arm64. -Also, x86_64 had to be built separately to enable the intrinsic -optimizations. Oops. +x86_64 and arm64 were built separately, to allow for intrinsic functions +to be used for x86_64. \ No newline at end of file diff --git a/ThirdParty/flac/lib/libFLAC.8.dylib b/ThirdParty/flac/lib/libFLAC.8.dylib index 0b0932212..0ac06a14c 100755 Binary files a/ThirdParty/flac/lib/libFLAC.8.dylib and b/ThirdParty/flac/lib/libFLAC.8.dylib differ