aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2013-07-04 12:51:02 -0600
committerJack Moffitt <jack@metajack.im>2013-07-04 12:51:02 -0600
commit1230282cece2552aaeaaf482133054c257221ec3 (patch)
tree1e3a7f3683c74b3fa06d4b9839950e067c3d9033
parent32c147fbde65a02e9721728fa536aab3a63c2063 (diff)
downloadservo-1230282cece2552aaeaaf482133054c257221ec3.tar.gz
servo-1230282cece2552aaeaaf482133054c257221ec3.zip
Add glfw and glfw-rs to servo build.
-rw-r--r--.gitmodules6
-rwxr-xr-xconfigure2
m---------src/support/glfw/glfw0
m---------src/support/glfw/glfw-rs0
4 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index c08e1f13a16..a6ab58d9897 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -94,3 +94,9 @@
[submodule "src/support/nss/nspr"]
path = src/support/nss/nspr
url = git://github.com/mozilla-servo/nspr.git
+[submodule "src/support/glfw/glfw"]
+ path = src/support/glfw/glfw
+ url = https://github.com/mozilla-servo/glfw.git
+[submodule "src/support/glfw/glfw-rs"]
+ path = src/support/glfw/glfw-rs
+ url = https://github.com/mozilla-servo/glfw-rs.git
diff --git a/configure b/configure
index cb7d9e135bf..6e037746f75 100755
--- a/configure
+++ b/configure
@@ -403,6 +403,8 @@ CFG_SUBMODULES="\
support/css/rust-css \
support/geom/rust-geom \
support/glut/rust-glut \
+ support/glfw/glfw \
+ support/glfw/glfw-rs \
support/harfbuzz/rust-harfbuzz \
support/http-client/rust-http-client \
support/hubbub/libhubbub \
diff --git a/src/support/glfw/glfw b/src/support/glfw/glfw
new file mode 160000
+Subproject 738b78899bb271258f55ae842e180de2c5ec87d
diff --git a/src/support/glfw/glfw-rs b/src/support/glfw/glfw-rs
new file mode 160000
+Subproject dc6b77d2df8cb425a55c5ef48f77320de092fa1