diff options
| author | Peng Liu <pengliu.2002@gmail.com> | 2013-08-17 20:55:48 -0700 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2013-08-20 14:43:08 -0600 |
| commit | bcf67d9d7fbdcf1e4cc1bd097e0060e23649b013 (patch) | |
| tree | 55a1892982bc75af894c062b26aaa93a54490ec0 | |
| parent | 488972e817a072f23b36e92b02a3cb5cccffa90e (diff) | |
| download | servo-bcf67d9d7fbdcf1e4cc1bd097e0060e23649b013.tar.gz servo-bcf67d9d7fbdcf1e4cc1bd097e0060e23649b013.zip | |
Pull libpng in tree to avoid the configuration issue related to libpng.
Most work done by @pliu6
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| m--------- | src/support/png/libpng | 0 | ||||
| m--------- | src/support/png/rust-png | 0 |
4 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index cbb9898d82c..1981724ad77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,6 @@ [submodule "src/support/png/rust-png"] path = src/support/png/rust-png url = https://github.com/mozilla-servo/rust-png.git +[submodule "src/support/png/libpng"] + path = src/support/png/libpng + url = https://github.com/mozilla-servo/libpng.git diff --git a/configure b/configure index 88f580db82c..14518202779 100755 --- a/configure +++ b/configure @@ -420,6 +420,7 @@ CFG_SUBMODULES="\ support/spidermonkey/mozjs \ support/spidermonkey/rust-mozjs \ support/stb-image/rust-stb-image \ + support/png/libpng \ support/png/rust-png \ support/wapcaplet/libwapcaplet \ support/wapcaplet/rust-wapcaplet" diff --git a/src/support/png/libpng b/src/support/png/libpng new file mode 160000 +Subproject bda7eca7c3962caadf1c25dac215519b8935b22 diff --git a/src/support/png/rust-png b/src/support/png/rust-png -Subproject 1d014441ff8100e79521de42cb25300ed409237 +Subproject d01eb726c0dcd46d71611e524ede00d28f382f2 |