Skip to content

Commit 26b3afc

Browse files
committed
more dlls
1 parent 1024017 commit 26b3afc

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

libobs/cmake/os-windows.cmake

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ 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
75+
set(DEPENDENCY_DLLS
7676
$<TARGET_FILE:FFmpeg::avcodec>
7777
$<TARGET_FILE:FFmpeg::avformat>
7878
$<TARGET_FILE:FFmpeg::avutil>
@@ -84,24 +84,28 @@ set(DEP_BINARIES
8484
$<TARGET_FILE:FFmpeg::ffprobeexe>
8585
$<TARGET_FILE:Libx264::Libx264>
8686

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'):
9187
"$<TARGET_FILE_DIR:ZLIB::ZLIB>/../bin/zlib.dll"
88+
"$<TARGET_FILE_DIR:Librist::Librist>/../bin/librist.dll"
89+
"$<TARGET_FILE_DIR:Libsrt::Libsrt>/../bin/srt.dll"
90+
)
91+
set(DEPENDENCY_LIBS
92+
$<TARGET_FILE:Libsrt::Libsrt>
93+
$<TARGET_FILE:Librist::Librist>
94+
$<TARGET_FILE:ZLIB::ZLIB>
9295
)
9396

94-
foreach(DEP_BINARY ${DEP_BINARIES})
95-
message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
97+
# foreach(DEP_BINARY ${DEPENDENCY_DLLS})
98+
# message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
9699

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()
100+
# add_custom_command(TARGET libobs POST_BUILD
101+
# COMMAND "${CMAKE_COMMAND}" -E echo "Copying dependencies binaries ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}"
102+
# COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${DEP_BINARY}" "${OBS_EXECUTABLE_DESTINATION}"
103+
# COMMENT "."
104+
# VERBATIM COMMAND_EXPAND_LISTS
105+
# )
106+
# endforeach()
104107

105-
install(FILES ${DEP_BINARIES} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
108+
install(FILES ${DEPENDENCY_DLLS} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
109+
install(FILES ${DEPENDENCY_LIBS} DESTINATION ${OBS_LIBRARY_DESTINATION})
106110

107111
endif()

0 commit comments

Comments
 (0)