ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

deps: fix debug aom library on windows

Browse source 
Debug was copied on top of release by accident
This commit is contained in:
Ray Molenkamp 2026-01-23 10:47:15 -08:00
parent b9d54e0ccb
commit d1950e648c
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
build_files/build_environment/cmake/aom.cmake
View file

@ -73,17 +73,26 @@ endif()
if(NOT WIN32)
harvest(external_aom aom/lib ffmpeg/lib "*.a")
else()
# aom insists on building a static version even if you
# do not want it, get rid of it by coping the import lib
# on top of it, so other projects don't accidentally link
# the static library.
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/aom/
${HARVEST_TARGET}/aom/
DEPENDEES install
)
if(BUILD_MODE STREQUAL Release)
# aom insists on building a static version even if you
# do not want it, get rid of it by coping the import lib
# on top of it, so other projects don't accidentally link
# the static library.
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/aom/
${HARVEST_TARGET}/aom/
DEPENDEES install
)
else()
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
DEPENDEES install
)
endif()
endif()