Skip to content

Commit a986737

Browse files
saudetsaudet
committed
* Build LibTIFF after WebP to make sure they link correctly in presets for Leptonica
1 parent 0ed7959 commit a986737

File tree

2 files changed

+78
-77
lines changed

2 files changed

+78
-77
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
* Build LibTIFF after WebP to make sure they link correctly in presets for Leptonica
23
* Virtualize `IInt8Calibrator` plus subclasses from TensorRT to allow customization ([issue #902](https://github.com/bytedeco/javacpp-presets/issues/902))
34
* Replace `requires` with `requires static` in JPMS `.platform` modules ([pull #900](https://github.com/bytedeco/javacpp-presets/pull/900))
45
* Add presets for OpenPose 1.6.0 ([pull #898](https://github.com/bytedeco/javacpp-presets/pull/898))

‎leptonica/cppbuild.sh

+77-77
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,19 @@ case $PLATFORM in
7070
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux --with-sysroot="$ANDROID_ROOT" --disable-arm-neon
7171
make -j $MAKEJ
7272
make install
73-
cd ../$LIBTIFF
74-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
75-
make -j $MAKEJ
76-
make install
7773
cd ../$LIBWEBP
7874
patch -Np1 < ../../../libwebp-arm.patch
79-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-androideabi --with-sysroot="$ANDROID_ROOT" --disable-neon
75+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-androideabi --with-sysroot="$ANDROID_ROOT" --disable-neon --enable-libwebpmux
8076
cd src
8177
make -j $MAKEJ
8278
make install
83-
cd ../../leptonica-$LEPTONICA_VERSION
79+
cd ../../$LIBTIFF
80+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
81+
make -j $MAKEJ
82+
make install
83+
cd ../leptonica-$LEPTONICA_VERSION
8484
patch -Np1 < ../../../leptonica-android.patch
85-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=arm-linux-androideabi --disable-programs
85+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=arm-linux-androideabi --disable-programs --without-libopenjpeg
8686
make -j $MAKEJ
8787
make install-strip
8888
;;
@@ -109,19 +109,19 @@ case $PLATFORM in
109109
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux --with-sysroot="$ANDROID_ROOT" --disable-arm-neon
110110
make -j $MAKEJ
111111
make install
112-
cd ../$LIBTIFF
113-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
114-
make -j $MAKEJ
115-
make install
116112
cd ../$LIBWEBP
117113
patch -Np1 < ../../../libwebp-arm.patch
118-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-android --with-sysroot="$ANDROID_ROOT" --disable-neon
114+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-android --with-sysroot="$ANDROID_ROOT" --disable-neon --enable-libwebpmux
119115
cd src
120116
make -j $MAKEJ
121117
make install
122-
cd ../../leptonica-$LEPTONICA_VERSION
118+
cd ../../$LIBTIFF
119+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
120+
make -j $MAKEJ
121+
make install
122+
cd ../leptonica-$LEPTONICA_VERSION
123123
patch -Np1 < ../../../leptonica-android.patch
124-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=aarch64-linux-android --disable-programs
124+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=aarch64-linux-android --disable-programs --without-libopenjpeg
125125
make -j $MAKEJ
126126
make install-strip
127127
;;
@@ -148,18 +148,18 @@ case $PLATFORM in
148148
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --with-sysroot="$ANDROID_ROOT"
149149
make -j $MAKEJ
150150
make install
151-
cd ../$LIBTIFF
152-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
153-
make -j $MAKEJ
154-
make install
155151
cd ../$LIBWEBP
156-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux-android --with-sysroot="$ANDROID_ROOT"
152+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux-android --with-sysroot="$ANDROID_ROOT" --enable-libwebpmux
157153
cd src
158154
make -j $MAKEJ
159155
make install
160-
cd ../../leptonica-$LEPTONICA_VERSION
156+
cd ../../$LIBTIFF
157+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
158+
make -j $MAKEJ
159+
make install
160+
cd ../leptonica-$LEPTONICA_VERSION
161161
patch -Np1 < ../../../leptonica-android.patch
162-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=i686-linux-android --disable-programs
162+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=i686-linux-android --disable-programs --without-libopenjpeg
163163
make -j $MAKEJ
164164
make install-strip
165165
;;
@@ -186,23 +186,23 @@ case $PLATFORM in
186186
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --with-sysroot="$ANDROID_ROOT"
187187
make -j $MAKEJ
188188
make install
189-
cd ../$LIBTIFF
190-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
191-
make -j $MAKEJ
192-
make install
193189
cd ../$LIBWEBP
194-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux-android --with-sysroot="$ANDROID_ROOT"
190+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux-android --with-sysroot="$ANDROID_ROOT" --enable-libwebpmux
195191
cd src
196192
make -j $MAKEJ
197193
make install
198-
cd ../../leptonica-$LEPTONICA_VERSION
194+
cd ../../$LIBTIFF
195+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --with-sysroot="$ANDROID_ROOT" --disable-lzma --disable-zstd --without-x
196+
make -j $MAKEJ
197+
make install
198+
cd ../leptonica-$LEPTONICA_VERSION
199199
patch -Np1 < ../../../leptonica-android.patch
200-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=x86_64-linux-android --disable-programs
200+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH --host=x86_64-linux-android --disable-programs --without-libopenjpeg
201201
make -j $MAKEJ
202202
make install-strip
203203
;;
204204
linux-x86)
205-
export CFLAGS="-I$INSTALL_PATH/include/"
205+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
206206
export CXXFLAGS="$CFLAGS"
207207
export CPPFLAGS="$CFLAGS"
208208
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -223,21 +223,21 @@ case $PLATFORM in
223223
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux
224224
make -j $MAKEJ
225225
make install
226-
cd ../$LIBTIFF
227-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-lzma --disable-zstd
226+
cd ../$LIBWEBP
227+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --enable-libwebpmux
228228
make -j $MAKEJ
229229
make install
230-
cd ../$LIBWEBP
231-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux
230+
cd ../$LIBTIFF
231+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-lzma --disable-zstd
232232
make -j $MAKEJ
233233
make install
234234
cd ../leptonica-$LEPTONICA_VERSION
235-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs
235+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs --without-libopenjpeg
236236
make -j $MAKEJ
237237
make install-strip
238238
;;
239239
linux-x86_64)
240-
export CFLAGS="-I$INSTALL_PATH/include/"
240+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
241241
export CXXFLAGS="$CFLAGS"
242242
export CPPFLAGS="$CFLAGS"
243243
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -258,21 +258,21 @@ case $PLATFORM in
258258
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux
259259
make -j $MAKEJ
260260
make install
261-
cd ../$LIBTIFF
262-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-lzma --disable-zstd
261+
cd ../$LIBWEBP
262+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --enable-libwebpmux
263263
make -j $MAKEJ
264264
make install
265-
cd ../$LIBWEBP
266-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux
265+
cd ../$LIBTIFF
266+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux --disable-lzma --disable-zstd
267267
make -j $MAKEJ
268268
make install
269269
cd ../leptonica-$LEPTONICA_VERSION
270-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs
270+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs --without-libopenjpeg
271271
make -j $MAKEJ
272272
make install-strip
273273
;;
274274
linux-armhf)
275-
export CFLAGS="-march=armv6 -marm -mfpu=vfp -mfloat-abi=hard -I$INSTALL_PATH/include/"
275+
export CFLAGS="-pthread -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard -I$INSTALL_PATH/include/"
276276
export CXXFLAGS="$CFLAGS"
277277
export CPPFLAGS="$CFLAGS"
278278
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -295,22 +295,22 @@ case $PLATFORM in
295295
CC="arm-linux-gnueabihf-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-arm-neon
296296
make -j $MAKEJ
297297
make install
298-
cd ../$LIBTIFF
299-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd --host=arm-linux-gnueabihf
300-
make -j $MAKEJ
301-
make install
302298
cd ../$LIBWEBP
303299
patch -Np1 < ../../../libwebp-arm.patch
304-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-neon
300+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=arm-linux-gnueabihf --disable-neon --enable-libwebpmux
301+
make -j $MAKEJ
302+
make install
303+
cd ../$LIBTIFF
304+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd --host=arm-linux-gnueabihf
305305
make -j $MAKEJ
306306
make install
307307
cd ../leptonica-$LEPTONICA_VERSION
308-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ CC="arm-linux-gnueabihf-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --host=arm-linux-gnueabihf --disable-programs
308+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ CC="arm-linux-gnueabihf-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --host=arm-linux-gnueabihf --disable-programs --without-libopenjpeg
309309
make -j $MAKEJ
310310
make install-strip
311311
;;
312312
linux-arm64)
313-
export CFLAGS="-I$INSTALL_PATH/include/"
313+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
314314
export CXXFLAGS="$CFLAGS"
315315
export CPPFLAGS="$CFLAGS"
316316
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -332,21 +332,21 @@ case $PLATFORM in
332332
CC="aarch64-linux-gnu-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-shared --with-pic --host=aarch64-linux-gnu
333333
make -j $MAKEJ
334334
make install
335-
cd ../$LIBTIFF
336-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd --host=aarch64-linux-gnu
335+
cd ../$LIBWEBP
336+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --enable-libwebpmux
337337
make -j $MAKEJ
338338
make install
339-
cd ../$LIBWEBP
340-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu
339+
cd ../$LIBTIFF
340+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd --host=aarch64-linux-gnu
341341
make -j $MAKEJ
342342
make install
343343
cd ../leptonica-$LEPTONICA_VERSION
344-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ CC="aarch64-linux-gnu-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --host=aarch64-linux-gnu --disable-programs
344+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ CC="aarch64-linux-gnu-gcc -fPIC" ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --host=aarch64-linux-gnu --disable-programs --without-libopenjpeg
345345
make -j $MAKEJ
346346
make install-strip
347347
;;
348348
linux-ppc64le)
349-
export CFLAGS="-I$INSTALL_PATH/include/"
349+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
350350
export CXXFLAGS="$CFLAGS"
351351
export CPPFLAGS="$CFLAGS"
352352
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -376,22 +376,22 @@ case $PLATFORM in
376376
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic $BFLAGS
377377
make -j $MAKEJ
378378
make install
379-
cd ../$LIBTIFF
380-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic $BFLAGS --disable-lzma --disable-zstd
379+
cd ../$LIBWEBP
380+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic $BFLAGS --enable-libwebpmux
381381
make -j $MAKEJ
382382
make install
383-
cd ../$LIBWEBP
384-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic $BFLAGS
383+
cd ../$LIBTIFF
384+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic $BFLAGS --disable-lzma --disable-zstd
385385
make -j $MAKEJ
386386
make install
387387
cd ../leptonica-$LEPTONICA_VERSION
388388
sed -i s/elf64ppc/elf64lppc/ configure
389-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $BFLAGS --disable-programs
389+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $BFLAGS --disable-programs --without-libopenjpeg
390390
make -j $MAKEJ
391391
make install-strip
392392
;;
393393
macosx-*)
394-
export CFLAGS="-I$INSTALL_PATH/include/"
394+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
395395
export CXXFLAGS="$CFLAGS"
396396
export CPPFLAGS="$CFLAGS"
397397
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -411,22 +411,22 @@ case $PLATFORM in
411411
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic
412412
make -j $MAKEJ
413413
make install
414-
cd ../$LIBTIFF
415-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd
414+
cd ../$LIBWEBP
415+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --enable-libwebpmux
416416
make -j $MAKEJ
417417
make install
418-
cd ../$LIBWEBP
419-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic
418+
cd ../$LIBTIFF
419+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --disable-lzma --disable-zstd
420420
make -j $MAKEJ
421421
make install
422422
cd ../leptonica-$LEPTONICA_VERSION
423423
patch -Np1 < ../../../leptonica-macosx.patch
424-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs
424+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" --disable-programs --without-libopenjpeg
425425
make -j $MAKEJ
426426
make install-strip
427427
;;
428428
windows-x86)
429-
export CFLAGS="-I$INSTALL_PATH/include/"
429+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
430430
export CXXFLAGS="$CFLAGS"
431431
export CPPFLAGS="$CFLAGS"
432432
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -445,21 +445,21 @@ case $PLATFORM in
445445
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32
446446
make -j $MAKEJ
447447
make install
448-
cd ../$LIBTIFF
449-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32 --disable-lzma --disable-zstd
448+
cd ../$LIBWEBP
449+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32 --enable-libwebpmux
450450
make -j $MAKEJ
451451
make install
452-
cd ../$LIBWEBP
453-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32
452+
cd ../$LIBTIFF
453+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32 --disable-lzma --disable-zstd
454454
make -j $MAKEJ
455455
make install
456456
cd ../leptonica-$LEPTONICA_VERSION
457-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/ -Wl,$INSTALL_PATH/lib/*.a" --build=i686-w64-mingw32 --disable-programs
457+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/ -Wl,$INSTALL_PATH/lib/*.a" --build=i686-w64-mingw32 --disable-programs --without-libopenjpeg
458458
make -j $MAKEJ
459459
make install-strip
460460
;;
461461
windows-x86_64)
462-
export CFLAGS="-I$INSTALL_PATH/include/"
462+
export CFLAGS="-pthread -I$INSTALL_PATH/include/"
463463
export CXXFLAGS="$CFLAGS"
464464
export CPPFLAGS="$CFLAGS"
465465
export LDFLAGS="-L$INSTALL_PATH/lib/"
@@ -478,16 +478,16 @@ case $PLATFORM in
478478
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32
479479
make -j $MAKEJ
480480
make install
481-
cd ../$LIBTIFF
482-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32 --disable-lzma --disable-zstd
481+
cd ../$LIBWEBP
482+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32 --enable-libwebpmux
483483
make -j $MAKEJ
484484
make install
485-
cd ../$LIBWEBP
486-
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32
485+
cd ../$LIBTIFF
486+
./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32 --disable-lzma --disable-zstd
487487
make -j $MAKEJ
488488
make install
489489
cd ../leptonica-$LEPTONICA_VERSION
490-
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/ -Wl,$INSTALL_PATH/lib/*.a" --build=x86_64-w64-mingw32 --disable-programs
490+
PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/ ./configure --prefix=$INSTALL_PATH CFLAGS="-pthread -I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/ -Wl,$INSTALL_PATH/lib/*.a" --build=x86_64-w64-mingw32 --disable-programs --without-libopenjpeg
491491
make -j $MAKEJ
492492
make install-strip
493493
;;

0 commit comments

Comments
 (0)