[Bf-blender-cvs] [13a492dd9f4] tmp-vfx-platform-2023: deps_builder: fix harbuzz build on windows

Ray Molenkamp noreply at git.blender.org
Wed Oct 12 19:56:05 CEST 2022


Commit: 13a492dd9f48d1ae2710f1068cfa496fcded454f
Author: Ray Molenkamp
Date:   Wed Oct 12 17:55:35 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB13a492dd9f48d1ae2710f1068cfa496fcded454f

deps_builder: fix harbuzz build on windows

harfbuzz will only ever like freetype.lib
and will not be convinced by any other names
so just give it what it wants, there's no
fighting it without sinking in more time
than it is worth.

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

M	build_files/build_environment/cmake/freetype.cmake

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

diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake
index b6f53ede2db..0e9453cd77d 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -28,6 +28,9 @@ add_dependencies(
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_freetype after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
+	# harfbuzz *NEEDS* to find freetype.lib and will not be conviced to take alternative names so just give it
+	# what it wants. 
+	COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
     DEPENDEES install
   )
 endif()



More information about the Bf-blender-cvs mailing list