Commit 95c8daa1 authored by Wieland Morgenstern's avatar Wieland Morgenstern

Apple: link to VS_LIB_DEFAULT if USE_DELAY_LOAD is disabled

parent d35604e4
...@@ -432,7 +432,7 @@ else() ...@@ -432,7 +432,7 @@ else()
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG_UP}} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG_UP}}
-P ${CMAKE_SOURCE_DIR}/lib/generateFakeLibvideostitch.cmake -P ${CMAKE_SOURCE_DIR}/lib/generateFakeLibvideostitch.cmake
DEPENDS ${VS_LIB_DEFAULT}) DEPENDS ${VS_LIB_DEFAULT})
if(USE_DELAY_LOAD) if(USE_DELAY_LOAD AND MSVC)
add_dependencies(generateFakeLibvideostitch_${OUTPUTCONFIG_UP} ${VS_LIB_FAKE}) add_dependencies(generateFakeLibvideostitch_${OUTPUTCONFIG_UP} ${VS_LIB_FAKE})
endif() endif()
endforeach() endforeach()
...@@ -463,7 +463,13 @@ function(link_target_to_libvideostitch TARGET_NAME) ...@@ -463,7 +463,13 @@ function(link_target_to_libvideostitch TARGET_NAME)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS ${new_link_flags}) set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS ${new_link_flags})
endif() endif()
elseif(APPLE) elseif(APPLE)
target_link_libraries(${TARGET_NAME} PRIVATE ${VS_LIB_FAKE})
if (USE_DELAY_LOAD)
target_link_libraries(${TARGET_NAME} PRIVATE ${VS_LIB_FAKE})
else()
target_link_libraries(${TARGET_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif()
# ensure the non-fake backend libs are built # ensure the non-fake backend libs are built
if(GPU_BACKEND_CUDA) if(GPU_BACKEND_CUDA)
add_dependencies(${TARGET_NAME} ${VS_LIB_CUDA}) add_dependencies(${TARGET_NAME} ${VS_LIB_CUDA})
......
...@@ -79,7 +79,11 @@ function(setup_av_plugin PLUGIN_NAME BACKEND_NAME USE_CUDA) ...@@ -79,7 +79,11 @@ function(setup_av_plugin PLUGIN_NAME BACKEND_NAME USE_CUDA)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${libmfxhw64} ${DirectX_LIB}) target_link_libraries(${PLUGIN_NAME} PRIVATE ${libmfxhw64} ${DirectX_LIB})
set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd") set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd")
elseif(APPLE) elseif(APPLE)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_FAKE}) if (USE_DELAY_LOAD)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_FAKE})
else()
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif()
else() else()
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_DEFAULT}) target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment