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

Add sharegl and rust-io-surface to the build

Browse source
This commit is contained in:
Patrick Walton 2012-09-20 16:58:29 -07:00
parent fa257b7e98
commit 7a077e3459
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile.in
View file

@ -31,6 +31,7 @@ RUSTLIBS = \
-L src/rust-hubbub \ -L src/rust-hubbub \
-L src/rust-core-foundation \ -L src/rust-core-foundation \
-L src/rust-io-surface \ -L src/rust-io-surface \
-L src/sharegl \
$(NULL) $(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -50,6 +51,9 @@ LAYERS_DEPS = \
src/rust-opengles/librustopengles.dummy \ src/rust-opengles/librustopengles.dummy \
src/rust-glut/librustglut.dummy \ src/rust-glut/librustglut.dummy \
src/rust-azure/libazure.dummy src/rust-azure/libazure.dummy
SHAREGL_DEPS = \
src/rust-opengles/librustopengles.dummy \
src/sharegl/libsharegl.dummy
ifeq ($(OSTYPE),darwin) ifeq ($(OSTYPE),darwin)
SERVO_DEPS += \ SERVO_DEPS += \
@ -73,6 +77,9 @@ ifeq ($(OSTYPE),darwin)
src/rust-cocoa/libcocoa.dummy \ src/rust-cocoa/libcocoa.dummy \
src/rust-core-foundation/librustcorefoundation.dummy src/rust-core-foundation/librustcorefoundation.dummy
IOSURFACE_DEPS = src/rust-core-foundation/librustcorefoundation.dummy IOSURFACE_DEPS = src/rust-core-foundation/librustcorefoundation.dummy
SHAREGL_DEPS += \
src/rust-core-foundation/librustcorefoundation.dummy \
src/rust-io-surface/librustiosurface.dummy
endif endif
SERVO_DEPS += \ SERVO_DEPS += \
@ -90,6 +97,7 @@ SERVO_DEPS += \
src/libhubbub/libhubbub.dummy \ src/libhubbub/libhubbub.dummy \
src/servo-sandbox/servo-sandbox.dummy \ src/servo-sandbox/servo-sandbox.dummy \
src/rust-hubbub/librusthubbub.dummy \ src/rust-hubbub/librusthubbub.dummy \
src/sharegl/libsharegl.dummy \
$(NULL) $(NULL)
CHECK_DEPS += \ CHECK_DEPS += \
@ -182,6 +190,8 @@ servo-sandbox: src/servo-sandbox/servo-sandbox.dummy
rust-io-surface: src/rust-io-surface/librustiosurface.dummy rust-io-surface: src/rust-io-surface/librustiosurface.dummy
sharegl: src/sharegl/libsharegl.dummy
# Subproject rules # Subproject rules
@ -238,6 +248,9 @@ src/rust-core-foundation/librustcorefoundation.dummy:
src/rust-io-surface/librustiosurface.dummy: $(IOSURFACE_DEPS) src/rust-io-surface/librustiosurface.dummy: $(IOSURFACE_DEPS)
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-core-foundation" $(MAKE) -C src/rust-io-surface RUSTFLAGS="$(RUSTFLAGS) -L ../rust-core-foundation" $(MAKE) -C src/rust-io-surface
src/sharegl/libsharegl.dummy: $(SHAREGL_DEPS)
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-core-foundation -L ../rust-io-surface -L ../rust-opengles -L ../rust-geom" $(MAKE) -C src/sharegl
# Testing targets # Testing targets

2
configure vendored
View file

@ -337,6 +337,7 @@ make_dir src/servo-sandbox
make_dir src/rust-hubbub make_dir src/rust-hubbub
make_dir src/rust-core-foundation make_dir src/rust-core-foundation
make_dir src/rust-io-surface make_dir src/rust-io-surface
make_dir src/sharegl
make_dir src/test/ref make_dir src/test/ref
@ -361,6 +362,7 @@ step_msg "running submodule configure scripts"
(cd ${CFG_BUILD_DIR}src/rust-hubbub && sh ${CFG_SRC_DIR}src/rust-hubbub/configure) || exit $? (cd ${CFG_BUILD_DIR}src/rust-hubbub && sh ${CFG_SRC_DIR}src/rust-hubbub/configure) || exit $?
(cd ${CFG_BUILD_DIR}src/rust-core-foundation && sh ${CFG_SRC_DIR}src/rust-core-foundation/configure) || exit $? (cd ${CFG_BUILD_DIR}src/rust-core-foundation && sh ${CFG_SRC_DIR}src/rust-core-foundation/configure) || exit $?
(cd ${CFG_BUILD_DIR}src/rust-io-surface && sh ${CFG_SRC_DIR}src/rust-io-surface/configure) || exit $? (cd ${CFG_BUILD_DIR}src/rust-io-surface && sh ${CFG_SRC_DIR}src/rust-io-surface/configure) || exit $?
(cd ${CFG_BUILD_DIR}src/sharegl && sh ${CFG_SRC_DIR}src/sharegl/configure) || exit $?
step_msg "writing configuration" step_msg "writing configuration"

2
src/rust-io-surface

@ -1 +1 @@
Subproject commit 7b77ca7b9fc96366b4ab07ad6609236d2ebe5afa Subproject commit fe04eedea0cdb6ea6950b32264249d5a2aeca13d

2
src/sharegl

@ -1 +1 @@
Subproject commit 43c70aec39e894f8d26d1fd0005bece15c7239a7 Subproject commit 7d66ab1569efd526afda3c7d641d6b943a3fdc7a