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

Add layers and fix checks

Browse source
This commit is contained in:
Patrick Walton 2012-07-05 16:09:50 -07:00
parent 36a7ca67e1
commit 12729d36f7
6 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

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

27
Makefile.in
View file

@ -23,6 +23,7 @@ RUSTFLAGS += \
-L src/rust-geom \
-L src/rust-opengles \
-L src/rust-glut \
-L src/rust-layers \
$(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -35,6 +36,13 @@ CHECK_DEPS =
CLEAN_DEPS =
AZURE_DEPS = \
src/rust-geom/libgeom.dummy
GLUT_DEPS = \
src/rust-opengles/libopengles.dummy
LAYERS_DEPS = \
src/rust-geom/libgeom.dummy \
src/rust-opengles/libopengles.dummy \
src/rust-glut/libglut.dummy \
src/rust-azure/libazure.dummy \
ifeq ($(OSTYPE),darwin)
SERVO_DEPS += src/rust-cocoa/libcocoa.dummy
@ -43,6 +51,7 @@ ifeq ($(OSTYPE),darwin)
CHECK_DEPS += check-rust-cocoa
CLEAN_DEPS += clean-rust-cocoa
AZURE_DEPS += src/rust-cocoa/libcocoa.dummy src/rust-geom/libgeom.dummy
LAYERS_DEPS += src/rust-cocoa/libcocoa.dummy
endif
SERVO_DEPS += \
@ -54,6 +63,7 @@ SERVO_DEPS += \
src/rust-geom/libgeom.dummy \
src/rust-opengles/libopengles.dummy \
src/rust-glut/libglut.dummy \
src/rust-layers/liblayers.dummy \
$(NULL)
CHECK_DEPS += \
@ -65,6 +75,7 @@ CHECK_DEPS += \
check-rust-geom \
check-rust-opengles \
check-rust-glut \
check-rust-layers \
check-servo \
$(NULL)
@ -79,6 +90,7 @@ CLEAN_DEPS += \
clean-rust-geom \
clean-rust-opengles \
clean-rust-glut \
clean-rust-layers \
clean-servo \
$(NULL)
@ -128,8 +140,12 @@ 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
src/rust-glut/libglut.dummy: $(GLUT_DEPS)
RUSTFLAGS="-L ../rust-opengles" $(MAKE) -C src/rust-glut
src/rust-layers/liblayers.dummy: $(LAYERS_DEPS)
RUSTFLAGS="-L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
$(MAKE) -C src/rust-layers
check: $(CHECK_DEPS)
@ -171,7 +187,12 @@ check-rust-opengles:
.PHONY: check-rust-glut
check-rust-glut:
$(MAKE) check -C src/rust-glut
RUSTFLAGS="-L ../rust-opengles" $(MAKE) check -C src/rust-glut
.PHONY: check-rust-layers
check-rust-layers:
RUSTFLAGS="-L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
$(MAKE) check -C src/rust-layers
.PHONY: clean
clean: $(CLEAN_DEPS)

3
configure.in
View file

@ -15,6 +15,7 @@ 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 $?
mkdir -p src/rust-layers || exit $?
(cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
(cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
@ -28,3 +29,5 @@ mkdir -p src/rust-glut || 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 $?
(cd src/rust-layers && sh ${SRCDIR}/src/rust-layers/configure) || exit $?

2
src/rust-glut

@ -1 +1 @@
Subproject commit ee552b7a521bf3de19c60906f911966c18326d60
Subproject commit 2ebb1301b905daa23fcfccec4b798b8392326966

1
src/rust-layers Submodule

@ -0,0 +1 @@
Subproject commit 0272b9e05e312cf3913c199269c01636cbd9423f

2
src/rust-opengles

@ -1 +1 @@
Subproject commit f111c99124a3f0cce5818d4d7a0ee80c93cf85ad
Subproject commit 2c0c13349317a81eae3e749c7bd4ae847ff85f08