Skip to content

Commit 2e36b23

Browse files
committed
For vendored builds use the jpeg and zlib submodules instead of bundled sources
1 parent 5e307ee commit 2e36b23

File tree

441 files changed

+12
-194056
lines changed

Some content is hidden

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

441 files changed

+12
-194056
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "qpdf-sys/qpdf"]
22
path = qpdf-sys/qpdf
33
url = https://github.com/qpdf/qpdf
4+
[submodule "qpdf-sys/zlib"]
5+
path = qpdf-sys/zlib
6+
url = https://github.com/madler/zlib.git
7+
[submodule "qpdf-sys/jpeg"]
8+
path = qpdf-sys/jpeg
9+
url = https://github.com/libjpeg-turbo/ijg.git

qpdf-sys/build.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ fn build_qpdf() {
221221

222222
build
223223
.cpp(true)
224-
.include(root.join("zlib-1.3.1"))
225-
.include(root.join("jpeg-9d"))
224+
.include(root.join("zlib"))
225+
.include(root.join("jpeg"))
226226
.include(root.join("qpdf").join("include"))
227227
.include(root.join("qpdf").join("libqpdf"))
228228
.files(
@@ -262,8 +262,8 @@ fn build_bindings() {
262262
#[cfg(feature = "vendored")]
263263
fn main() {
264264
build_bindings();
265-
build_cc("zlib", "zlib-1.3.1", ZLIB_SRC);
266-
build_cc("jpeg", "jpeg-9d", JPEG_SRC);
265+
build_cc("zlib", "zlib", ZLIB_SRC);
266+
build_cc("jpeg", "jpeg", JPEG_SRC);
267267
build_qpdf();
268268
}
269269

qpdf-sys/jpeg

Submodule jpeg added at 7f0b6f5

qpdf-sys/jpeg-9d/Makefile.am

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

0 commit comments

Comments
 (0)