diff --git a/.gitmodules b/.gitmodules index fa862916b9c..8048dfe21ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -79,3 +79,6 @@ [submodule "src/rust-cairo"] path = src/rust-cairo url = git://github.com/mozilla-servo/rust-cairo.git +[submodule "src/rust-css"] + path = src/rust-css + url = git://github.com/mozilla-servo/rust-css.git diff --git a/configure b/configure index 7475f14c94e..9147ab8e5e3 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-wapcaplet rust-harfbuzz rust-opengles rust-azure rust-cairo rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-hubbub sharegl rust-mozjs mozjs" +CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles rust-azure rust-cairo rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs" if [ $CFG_OSTYPE = "darwin" ] then diff --git a/mk/sub.mk b/mk/sub.mk index cf4428ae615..f201f538627 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -36,6 +36,10 @@ DEPS_rust-wapcaplet += \ CFLAGS_rust-wapcaplet += \ "-I$(S)src/libwapcaplet/include" +DEPS_rust-css += \ + rust-netsurfcss \ + rust-wapcaplet + CFLAGS_mozjs += \ "-I../mozjs/dist/include" diff --git a/src/rust-css b/src/rust-css new file mode 160000 index 00000000000..8b668287b7c --- /dev/null +++ b/src/rust-css @@ -0,0 +1 @@ +Subproject commit 8b668287b7c208abbd6e29f1413387e5cefe4491 diff --git a/src/servo/servo.rc b/src/servo/servo.rc index dc23ab603a2..0248aeb1571 100755 --- a/src/servo/servo.rc +++ b/src/servo/servo.rc @@ -20,6 +20,7 @@ extern mod opengles; extern mod sharegl; extern mod stb_image; extern mod std; +extern mod newcss (name = "css"); pub mod engine;