OpenToonz - An open-source full-featured 2D animation creation software
C
CI - Windows: Bump OpenCV to 4.11.0
xavier2k626eed4f95490
diff --git a/.github/workflows/workflow_windows.yml b/.github/workflows/workflow_windows.ymlindex bd74cfdd9..8edc57f8a 100644--- a/.github/workflows/workflow_windows.yml+++ b/.github/workflows/workflow_windows.yml@@ -38,7 +38,7 @@ jobs:- name: Install OpenCV and Boostrun: |@echo on- choco install opencv --version=4.10.0 -y+ choco install opencv --version=4.11.0 -ychoco install boost-msvc-14.2 --version=1.74.0 -yshell: cmd@@ -94,7 +94,7 @@ jobs:copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll OpentoonzREM Copy OpenCV DLL (IMPORTANT: Update path/filename when upgrading OpenCV version)- copy /Y "C:\tools\opencv\build\x64\vc16\bin\opencv_world4100.dll" Opentoonz+ copy /Y "C:\tools\opencv\build\x64\vc16\bin\opencv_world4110.dll" OpentoonzREM Deploy Qt dependencies"%QT_PATH%\bin\windeployqt.exe" Opentoonz\Opentoonz.exe --opengldiff --git a/appveyor.yml b/appveyor.ymlindex 582da1cf1..78d56eb0f 100644--- a/appveyor.yml+++ b/appveyor.yml@@ -12,7 +12,7 @@ cache:- C:\Tools\opencvinstall:- cmd: >-- if exist "C:\Tools\opencv\build" (echo OpenCV cached, skipping install) else (choco install opencv --version=4.10.0 --no-progress --yes --force)+ if exist "C:\Tools\opencv\build\x64\vc16\bin\opencv_world4110.dll" (echo OpenCV cached, skipping install) else (choco install opencv --version=4.11.0 --no-progress --yes --force)cd thirdparty@@ -40,7 +40,7 @@ after_build:copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION%- copy /Y "C:\Tools\opencv\build\x64\vc16\bin\opencv_world4100.dll" %CONFIGURATION%+ copy /Y "C:\Tools\opencv\build\x64\vc16\bin\opencv_world4110.dll" %CONFIGURATION%xcopy /Y /E ..\..\thirdparty\libmypaint\dist\64\*.dll %CONFIGURATION%