Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add rust-glut support

Browse source
This commit is contained in:
Patrick Walton 2012-07-05 15:32:35 -07:00
parent 96d8c76713
commit 36a7ca67e1
4 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -31,3 +31,6 @@
[submodule "src/rust-opengles"]
path = src/rust-opengles
url = git://github.com/pcwalton/rust-opengles.git
[submodule "src/rust-glut"]
path = src/rust-glut
url = git://github.com/pcwalton/rust-glut.git

11
Makefile.in
View file

@ -22,6 +22,7 @@ RUSTFLAGS += \
-L src/rust-stb-image \
-L src/rust-geom \
-L src/rust-opengles \
-L src/rust-glut \
$(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -52,6 +53,7 @@ SERVO_DEPS += \
src/rust-stb-image/libstb-image.dummy \
src/rust-geom/libgeom.dummy \
src/rust-opengles/libopengles.dummy \
src/rust-glut/libglut.dummy \
$(NULL)
CHECK_DEPS += \
@ -62,6 +64,7 @@ CHECK_DEPS += \
check-rust-stb-image \
check-rust-geom \
check-rust-opengles \
check-rust-glut \
check-servo \
$(NULL)
@ -75,6 +78,7 @@ CLEAN_DEPS += \
clean-rust-stb-image \
clean-rust-geom \
clean-rust-opengles \
clean-rust-glut \
clean-servo \
$(NULL)
@ -124,6 +128,9 @@ src/rust-geom/libgeom.dummy:
src/rust-opengles/libopengles.dummy:
$(MAKE) -C src/rust-opengles
src/rust-glut/libglut.dummy:
$(MAKE) -C src/rust-glut
check: $(CHECK_DEPS)
check-servo: servo-test
@ -162,6 +169,10 @@ check-rust-geom:
check-rust-opengles:
$(MAKE) check -C src/rust-opengles
.PHONY: check-rust-glut
check-rust-glut:
$(MAKE) check -C src/rust-glut
.PHONY: clean
clean: $(CLEAN_DEPS)

2
configure.in
View file

@ -14,6 +14,7 @@ mkdir -p src/rust-azure || exit $?
mkdir -p src/rust-cocoa || exit $?
mkdir -p src/rust-stb-image || exit $?
mkdir -p src/rust-geom || exit $?
mkdir -p src/rust-glut || exit $?
(cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
(cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
@ -26,3 +27,4 @@ mkdir -p src/rust-geom || exit $?
(cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure) || exit $?
(cd src/rust-stb-image && sh ${SRCDIR}/src/rust-stb-image/configure) || exit $?
(cd src/rust-geom && sh ${SRCDIR}/src/rust-geom/configure) || exit $?
(cd src/rust-glut && sh ${SRCDIR}/src/rust-glut/configure) || exit $?

1
src/rust-glut Submodule

@ -0,0 +1 @@
Subproject commit ee552b7a521bf3de19c60906f911966c18326d60