Skip to content

Commit 1024017

Browse files
committed
add more libs
1 parent 40db1bf commit 1024017

File tree

1 file changed

+29
-24
lines changed

1 file changed

+29
-24
lines changed

libobs/cmake/os-windows.cmake

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,36 @@ target_link_options(libobs PRIVATE /IGNORE:4098 /SAFESEH:NO)
7272
set_target_properties(libobs PROPERTIES PREFIX "" OUTPUT_NAME "obs")
7373

7474
if(NOT ENABLE_UI)
75-
set(DEP_BINARIES
76-
$<TARGET_FILE:FFmpeg::avcodec>
77-
$<TARGET_FILE:FFmpeg::avformat>
78-
$<TARGET_FILE:FFmpeg::avutil>
79-
$<TARGET_FILE:FFmpeg::swscale>
80-
$<TARGET_FILE:FFmpeg::swresample>
81-
$<TARGET_FILE:FFmpeg::avfilter>
82-
$<TARGET_FILE:FFmpeg::avdevice>
83-
84-
$<TARGET_FILE:FFmpeg::ffmpegexe>
85-
$<TARGET_FILE:FFmpeg::ffprobeexe>
86-
87-
$<TARGET_FILE:Libx264::Libx264>
88-
$<TARGET_FILE:ZLIB::ZLIB>
89-
)
75+
set(DEP_BINARIES
76+
$<TARGET_FILE:FFmpeg::avcodec>
77+
$<TARGET_FILE:FFmpeg::avformat>
78+
$<TARGET_FILE:FFmpeg::avutil>
79+
$<TARGET_FILE:FFmpeg::swscale>
80+
$<TARGET_FILE:FFmpeg::swresample>
81+
$<TARGET_FILE:FFmpeg::avfilter>
82+
$<TARGET_FILE:FFmpeg::avdevice>
83+
$<TARGET_FILE:FFmpeg::ffmpegexe>
84+
$<TARGET_FILE:FFmpeg::ffprobeexe>
85+
$<TARGET_FILE:Libx264::Libx264>
86+
87+
# zlib.lib (import library or static lib):
88+
$<TARGET_FILE:ZLIB::ZLIB>
89+
90+
# zlib.dll (up one folder from 'lib', then into 'bin'):
91+
"$<TARGET_FILE_DIR:ZLIB::ZLIB>/../bin/zlib.dll"
92+
)
9093

91-
foreach(DEP_BINARY ${DEP_BINARIES})
92-
message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
94+
foreach(DEP_BINARY ${DEP_BINARIES})
95+
message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
96+
97+
add_custom_command(TARGET libobs POST_BUILD
98+
COMMAND "${CMAKE_COMMAND}" -E echo "Copying dependencies binaries ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}"
99+
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${DEP_BINARY}" "${OBS_EXECUTABLE_DESTINATION}"
100+
COMMENT "."
101+
VERBATIM COMMAND_EXPAND_LISTS
102+
)
103+
endforeach()
93104

94-
add_custom_command(TARGET libobs POST_BUILD
95-
COMMAND "${CMAKE_COMMAND}" -E echo "Copying dependencies binaries ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}"
96-
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${DEP_BINARY}" "${OBS_EXECUTABLE_DESTINATION}"
97-
COMMENT "."
98-
VERBATIM COMMAND_EXPAND_LISTS)
99-
endforeach()
105+
install(FILES ${DEP_BINARIES} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
100106

101-
install(FILES ${DEP_BINARIES} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
102107
endif()

0 commit comments

Comments
 (0)