diff --git a/GreenScreen/CMakeLists.txt b/GreenScreen/CMakeLists.txt index 15f1802382cad8283ee60755efe3713cfc68a9d4..264ec74182e8cc2204bb12df02bc3e74fba31086 100644 --- a/GreenScreen/CMakeLists.txt +++ b/GreenScreen/CMakeLists.txt @@ -93,7 +93,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} ) target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx - libzlib ws2_32 Bcrypt Crypt32 Secur32 Dnsapi opencv_imgproc411 opencv_core411 onnxruntime msvcrt) + libzlib ws2_32 Bcrypt Crypt32 Secur32 Dnsapi opencv_imgproc460 opencv_core460 onnxruntime msvcrt) endif() add_custom_command( diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt index 1a77e942f340fab2dfdf911df888ff84863eb1c4..0721bebfb8e8c0a7eb73d7c5f3a4b15c13ab6501 100644 --- a/HelloWorld/CMakeLists.txt +++ b/HelloWorld/CMakeLists.txt @@ -74,7 +74,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} ${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release ) -target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc411 opencv_core411 zlib) +target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc460 opencv_core460 zlib) add_custom_command( TARGET ${ProjectName} diff --git a/README_ASSEMBLE.md b/README_ASSEMBLE.md index 39b590fc4d44cd62b1ca83bc2e37076d3875cb05..a1c96b28982fc0c4e2c0de626164972382359fc2 100644 --- a/README_ASSEMBLE.md +++ b/README_ASSEMBLE.md @@ -2,8 +2,8 @@ $ export DAEMON="<ring-project>/daemon" OPENCV AND OPENCV_CONTRIB BUILD INSTRUCTIONS -OPENCV VERSION 4.1.1 -OPENCV_CONTRIB VERSION 4.1.1 +OPENCV VERSION 4.6.0 +OPENCV_CONTRIB VERSION 4.6.0 For Android: 1) Download and install Android NDK diff --git a/TensorflowSegmentation/CMakeLists.txt b/TensorflowSegmentation/CMakeLists.txt index f451bbcba9115964cc48fc9c92670cb469298282..f8c40bcf9ee5adbea48ae650bf16a0ca6138a977 100644 --- a/TensorflowSegmentation/CMakeLists.txt +++ b/TensorflowSegmentation/CMakeLists.txt @@ -120,7 +120,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} ${FFMPEG}/bin ) -target_link_libraries(${ProjectName} PUBLIC swscale avutil libpng opencv_imgcodecs411 opencv_imgproc411 opencv_core411 ${TFLIB} zlib) +target_link_libraries(${ProjectName} PUBLIC swscale avutil libpng opencv_imgcodecs411 opencv_imgproc460 opencv_core460 ${TFLIB} zlib) endif() if (UNIX)