Merge pull request #3738 from shun-iwasawa/remove_LibJpeg

Remove LibJpeg & add jpeg-turbo package in the thirdparty folder

Author: RodneyBaker

.github/workflows/workflow_windows.yml

@@ -44,7 +44,8 @@ jobs:
       run: |
         vcpkg install --clean-after-build --triplet x64-windows icu
         vcpkg install --clean-after-build --triplet x64-windows-static json-c libjpeg-turbo libpng lz4 lzo openblas zlib
-        vcpkg install --clean-after-build --triplet x64-windows freeglut glew opencv
+        vcpkg install --clean-after-build --triplet x64-windows freeglut glew
+        vcpkg install --clean-after-build --triplet x64-windows --recurse opencv[world]
         ls -Recurse C:/vcpkg/installed -Filter *.pdb | rm
 
     - name: Cache Qt
@@ -117,7 +118,6 @@ jobs:
     - name: Workaround
       run: |
         cd thirdparty
-        cp C:/vcpkg/installed/x64-windows-static/lib/jpeg.lib LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib
         cp C:/vcpkg/installed/x64-windows-static/lib/libpng16.lib libpng-1.6.21/lib/libpng16_2015_64.lib
         cp C:/vcpkg/installed/x64-windows-static/lib/lz4.lib Lz4/Lz4_131/lz4_64.lib
         cp C:/vcpkg/installed/x64-windows-static/lib/lzo2.lib lzo/2.03/LZO_lib/lzo2_64.lib
@@ -128,13 +128,12 @@ jobs:
         cp D:/a/opentoonz/opentoonz/libmypaint/build/Release/libmypaint.lib libmypaint/dist/64/libmypaint.lib
         cp D:/a/opentoonz/opentoonz/superlu/build/SRC/Release/superlu.lib superlu/SuperLU_2015_64.lib
         cp D:/a/opentoonz/opentoonz/thirdparty/tiff-4.0.3/prj/LibTIFF/x64/Release/LibTIFF.lib tiff-4.0.3/lib/LibTIFF-4.0.3_2015_64.lib
-        mkdir libjpeg-turbo64/lib
-        cp C:/vcpkg/installed/x64-windows-static/lib/turbojpeg.lib libjpeg-turbo64/lib/turbojpeg.lib
+        cp C:/vcpkg/installed/x64-windows-static/lib/turbojpeg.lib libjpeg-turbo/lib/turbojpeg-static_2015_64.lib
+        cp C:/vcpkg/installed/x64-windows-static/lib/jpeg.lib libjpeg-turbo/lib/jpeg-static_2015_64.lib
 
     - name: Copy headers
       run: |
         cd thirdparty
-        cp LibJPEG/jpeg-9/jconfig.vc LibJPEG/jpeg-9/jconfig.h
         cp libpng-1.6.21/scripts/pnglibconf.h.prebuilt libpng-1.6.21/pnglibconf.h
 
     - name: Build
@@ -157,6 +156,14 @@ jobs:
         D:/a/opentoonz/Qt/5.15.2/msvc2019_64/bin/windeployqt.exe OpenToonz.exe
         cp C:/vcpkg/installed/x64-windows/bin/freeglut.dll .
         cp C:/vcpkg/installed/x64-windows/bin/glew32.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/opencv_world.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/zlib1.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/webp.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/libpng16.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/jpeg62.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/tiff.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/lzma.dll .
+        cp C:/vcpkg/installed/x64-windows/bin/libprotobuf.dll .
 
     - uses: actions/upload-artifact@v1
       with:

appveyor.yml

@@ -10,30 +10,17 @@ platform: x64
 clone_depth: 1
 cache: c:\tools\vcpkg\installed
 install:
-- cmd: >- 
-    vcpkg install --clean-after-build --triplet x64-windows-static libjpeg-turbo
-
 - cmd: >-
     choco install opencv
 
     cd thirdparty
 
-    copy /Y LibJPEG\jpeg-9\jconfig.vc LibJPEG\jpeg-9\jconfig.h
-
     copy /Y tiff-4.0.3\libtiff\tif_config.vc.h tiff-4.0.3\libtiff\tif_config.h
 
     copy /Y tiff-4.0.3\libtiff\tiffconf.vc.h tiff-4.0.3\libtiff\tiffconf.h
 
     copy /Y libpng-1.6.21\scripts\pnglibconf.h.prebuilt libpng-1.6.21\pnglibconf.h
 
-    mkdir libjpeg-turbo64\lib
-
-    copy C:\tools\vcpkg\installed\x64-windows-static\lib\turbojpeg.lib libjpeg-turbo64\lib\turbojpeg.lib
-
-    mkdir libjpeg-turbo64\include
-    
-    copy C:\tools\vcpkg\installed\x64-windows-static\include\* libjpeg-turbo64\include
-
     cd ../toonz
 
     mkdir %PLATFORM% && cd %PLATFORM%