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

Fix rust-opengles; build rust-io-surface

Browse source
This commit is contained in:
Patrick Walton 2012-09-20 16:01:23 -07:00
parent be302ae2c9
commit fa257b7e98
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Makefile.in
View file

@ -30,6 +30,7 @@ RUSTLIBS = \
-L src/rust-http-client \ -L src/rust-http-client \
-L src/rust-hubbub \ -L src/rust-hubbub \
-L src/rust-core-foundation \ -L src/rust-core-foundation \
-L src/rust-io-surface \
$(NULL) $(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -53,17 +54,25 @@ LAYERS_DEPS = \
ifeq ($(OSTYPE),darwin) ifeq ($(OSTYPE),darwin)
SERVO_DEPS += \ SERVO_DEPS += \
src/rust-cocoa/libcocoa.dummy \ src/rust-cocoa/libcocoa.dummy \
src/rust-core-foundation/librustcorefoundation.dummy src/rust-core-foundation/librustcorefoundation.dummy \
src/rust-io-surface/librustiosurface.dummy
# I want the cocoa check to come before the servo check since if cocoa # I want the cocoa check to come before the servo check since if cocoa
# doesn't work neither does servo # doesn't work neither does servo
CHECK_DEPS += check-rust-cocoa check-rust-core-foundation CHECK_DEPS += \
CLEAN_DEPS += clean-rust-cocoa clean-rust-core-foundation check-rust-cocoa \
check-rust-core-foundation \
check-rust-io-surface
CLEAN_DEPS += \
clean-rust-cocoa \
clean-rust-core-foundation \
clean-rust-io-surface
AZURE_DEPS += \ AZURE_DEPS += \
src/rust-cocoa/libcocoa.dummy \ src/rust-cocoa/libcocoa.dummy \
src/rust-core-foundation/librustcorefoundation.dummy src/rust-core-foundation/librustcorefoundation.dummy
LAYERS_DEPS += \ LAYERS_DEPS += \
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
endif endif
SERVO_DEPS += \ SERVO_DEPS += \
@ -171,6 +180,8 @@ libhubbub: src/libhubbub/libhubbub.dummy
servo-sandbox: src/servo-sandbox/servo-sandbox.dummy servo-sandbox: src/servo-sandbox/servo-sandbox.dummy
rust-io-surface: src/rust-io-surface/librustiosurface.dummy
# Subproject rules # Subproject rules
@ -224,6 +235,9 @@ src/rust-hubbub/librusthubbub.dummy:
src/rust-core-foundation/librustcorefoundation.dummy: src/rust-core-foundation/librustcorefoundation.dummy:
$(MAKE) -C src/rust-core-foundation $(MAKE) -C src/rust-core-foundation
src/rust-io-surface/librustiosurface.dummy: $(IOSURFACE_DEPS)
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-core-foundation" $(MAKE) -C src/rust-io-surface
# Testing targets # Testing targets
@ -272,6 +286,9 @@ check-rust-http-client:
check-rust-core-foundation: check-rust-core-foundation:
$(MAKE) check -C src/rust-core-foundation $(MAKE) check -C src/rust-core-foundation
check-rust-io-surface:
$(MAKE) check -C src/rust-io-surface
# Clean targets # Clean targets
.PHONY: clean $(CLEAN_DEPS) .PHONY: clean $(CLEAN_DEPS)
@ -326,6 +343,9 @@ clean-servo-sandbox:
clean-rust-hubbub: clean-rust-hubbub:
$(MAKE) clean -C src/rust-hubbub $(MAKE) clean -C src/rust-hubbub
clean-rust-io-surface:
$(MAKE) clean -C src/rust-io-surface
clean-servo: clean-servo:
rm -f servo servo-test rm -f servo servo-test

2
configure vendored
View file

@ -336,6 +336,7 @@ make_dir src/libhubbub
make_dir src/servo-sandbox 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/test/ref make_dir src/test/ref
@ -359,6 +360,7 @@ step_msg "running submodule configure scripts"
(cd ${CFG_BUILD_DIR}src/servo-sandbox && sh ${CFG_SRC_DIR}src/servo-sandbox/configure) || exit $? (cd ${CFG_BUILD_DIR}src/servo-sandbox && sh ${CFG_SRC_DIR}src/servo-sandbox/configure) || exit $?
(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 $?
step_msg "writing configuration" step_msg "writing configuration"