mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-22 20:06:46 +00:00
Code Issues Releases Wiki Activity

Cleaned up macOS FFmpeg framework linking

Browse source 
I'm not sure why but CoreMedia, VideoToolbox, and AudioToolbox aren't
being found by find_library, so I've converted framework imports to a
standard link option. I really don't think this will be an issue given
that this change will only ever apply to Apple platforms.
This commit is contained in:
Andrew Dunn 2022-08-18 00:22:46 +10:00
parent 808a2e587a
commit a61237f265
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/CMakeLists.txt
View file

@ -221,12 +221,12 @@ if(APPLE)
target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
if (FFmpeg_FOUND) if (FFmpeg_FOUND)
find_library(COREVIDEO_FRAMEWORK CoreVideo) target_link_libraries(openmw z)
find_library(VDA_FRAMEWORK VideoDecodeAcceleration) target_link_options(openmw PRIVATE "LINKER:SHELL:-framework CoreVideo"
target_link_libraries(openmw z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK} "LINKER:SHELL:-framework CoreMedia"
"-framework VideoToolbox" "LINKER:SHELL:-framework VideoToolbox"
"-framework AudioToolbox" "LINKER:SHELL:-framework AudioToolbox"
"-framework CoreMedia") "LINKER:SHELL:-framework VideoDecodeAcceleration")
endif() endif()
endif(APPLE) endif(APPLE)