[Bf-blender-cvs] [9d274a609ca] master: cmake/win: Platform update for freetype 2.11.0
Ray Molenkamp
noreply at git.blender.org
Fri Jan 21 19:40:59 CET 2022
Commit: 9d274a609ca507fbd16f8daff95129281d4a24d8
Author: Ray Molenkamp
Date: Fri Jan 21 11:40:53 2022 -0700
Branches: master
https://developer.blender.org/rB9d274a609ca507fbd16f8daff95129281d4a24d8
cmake/win: Platform update for freetype 2.11.0
freetype now depends on brotli
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 26cdde9d819..0439e2fa5c2 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -347,7 +347,11 @@ set(FREETYPE_INCLUDE_DIRS
${LIBDIR}/freetype/include
${LIBDIR}/freetype/include/freetype2
)
-set(FREETYPE_LIBRARIES ${LIBDIR}/freetype/lib/freetype2ST.lib)
+set(FREETYPE_LIBRARIES
+ ${LIBDIR}/freetype/lib/freetype2ST.lib
+ ${LIBDIR}/brotli/lib/brotlidec-static.lib
+ ${LIBDIR}/brotli/lib/brotlicommon-static.lib
+)
windows_find_package(freetype REQUIRED)
if(WITH_FFTW3)
More information about the Bf-blender-cvs
mailing list