diff --git a/.gitmodules b/.gitmodules index 60cea92ab07..4f82a162380 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,3 +59,6 @@ path = src/libcss url = git://github.com/pcwalton/libcss.git +[submodule "src/rust-css"] + path = src/rust-css + url = git://github.com/brson/rust-css.git diff --git a/configure b/configure index a2a334d9996..6fd6463e0db 100755 --- a/configure +++ b/configure @@ -344,7 +344,7 @@ step_msg "running submodule autoconf scripts" (cd ${CFG_SRC_DIR}src/mozjs/js/src && "${CFG_AUTOCONF213}") || exit $? -CFG_SUBMODULES="libwapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss servo-sandbox rust-hubbub sharegl rust-mozjs mozjs" +CFG_SUBMODULES="libwapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-css servo-sandbox rust-hubbub sharegl rust-mozjs mozjs" if [ $CFG_OSTYPE = "darwin" ] then diff --git a/mk/sub.mk b/mk/sub.mk index bbfc0c753fc..2848d8bf950 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -21,6 +21,9 @@ DEPS_servo-sandbox += \ DEPS_rust-hubbub += \ libhubbub +DEPS_rust-css += \ + libcss + CFLAGS_mozjs += \ "-I../mozjs/dist/include" diff --git a/src/rust-css b/src/rust-css new file mode 160000 index 00000000000..0424ff2d467 --- /dev/null +++ b/src/rust-css @@ -0,0 +1 @@ +Subproject commit 0424ff2d46795d7d3c374b41cf258266fb486e08 diff --git a/src/servo/servo.rc b/src/servo/servo.rc index e98814ee18a..9e3b80e26c6 100755 --- a/src/servo/servo.rc +++ b/src/servo/servo.rc @@ -18,6 +18,7 @@ extern mod opengles; extern mod http_client; extern mod hubbub; extern mod sharegl; +extern mod cssparser (name = "css"); pub mod engine;