Skip to content

Commit 82a8f53

Browse files
committed
remove LibJpeg and add jpeg-turbo in thirdparty
1 parent 3e1efe7 commit 82a8f53

File tree

599 files changed

+143068
-83426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

599 files changed

+143068
-83426
lines changed

.github/workflows/workflow_windows.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ jobs:
117117
- name: Workaround
118118
run: |
119119
cd thirdparty
120-
cp C:/vcpkg/installed/x64-windows-static/lib/jpeg.lib LibJPEG/jpeg-9/lib/LibJPEG-9_2015_64.lib
121120
cp C:/vcpkg/installed/x64-windows-static/lib/libpng16.lib libpng-1.6.21/lib/libpng16_2015_64.lib
122121
cp C:/vcpkg/installed/x64-windows-static/lib/lz4.lib Lz4/Lz4_131/lz4_64.lib
123122
cp C:/vcpkg/installed/x64-windows-static/lib/lzo2.lib lzo/2.03/LZO_lib/lzo2_64.lib
@@ -128,13 +127,12 @@ jobs:
128127
cp D:/a/opentoonz/opentoonz/libmypaint/build/Release/libmypaint.lib libmypaint/dist/64/libmypaint.lib
129128
cp D:/a/opentoonz/opentoonz/superlu/build/SRC/Release/superlu.lib superlu/SuperLU_2015_64.lib
130129
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
131-
mkdir libjpeg-turbo64/lib
132-
cp C:/vcpkg/installed/x64-windows-static/lib/turbojpeg.lib libjpeg-turbo64/lib/turbojpeg.lib
130+
cp C:/vcpkg/installed/x64-windows-static/lib/turbojpeg.lib libjpeg-turbo/lib/turbojpeg-static_2015_64.lib
131+
cp C:/vcpkg/installed/x64-windows-static/lib/jpeg.lib libjpeg-turbo/lib/jpeg-static_2015_64.lib
133132
134133
- name: Copy headers
135134
run: |
136135
cd thirdparty
137-
cp LibJPEG/jpeg-9/jconfig.vc LibJPEG/jpeg-9/jconfig.h
138136
cp libpng-1.6.21/scripts/pnglibconf.h.prebuilt libpng-1.6.21/pnglibconf.h
139137
140138
- name: Build

appveyor.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,17 @@ platform: x64
1010
clone_depth: 1
1111
cache: c:\tools\vcpkg\installed
1212
install:
13-
- cmd: >-
14-
vcpkg install --clean-after-build --triplet x64-windows-static libjpeg-turbo
15-
1613
- cmd: >-
1714
choco install opencv
1815
1916
cd thirdparty
2017
21-
copy /Y LibJPEG\jpeg-9\jconfig.vc LibJPEG\jpeg-9\jconfig.h
22-
2318
copy /Y tiff-4.0.3\libtiff\tif_config.vc.h tiff-4.0.3\libtiff\tif_config.h
2419
2520
copy /Y tiff-4.0.3\libtiff\tiffconf.vc.h tiff-4.0.3\libtiff\tiffconf.h
2621
2722
copy /Y libpng-1.6.21\scripts\pnglibconf.h.prebuilt libpng-1.6.21\pnglibconf.h
2823
29-
mkdir libjpeg-turbo64\lib
30-
31-
copy C:\tools\vcpkg\installed\x64-windows-static\lib\turbojpeg.lib libjpeg-turbo64\lib\turbojpeg.lib
32-
33-
mkdir libjpeg-turbo64\include
34-
35-
copy C:\tools\vcpkg\installed\x64-windows-static\include\* libjpeg-turbo64\include
36-
3724
cd ../toonz
3825
3926
mkdir %PLATFORM% && cd %PLATFORM%

thirdparty/LibJPEG/README.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

thirdparty/LibJPEG/clean.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

thirdparty/LibJPEG/jpeg-9/Makefile.am

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)