diff --git a/.gitmodules b/.gitmodules index 48eed570a2d..2b613359cb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "src/rust-sdl"] - path = src/rust-sdl - url = git://github.com/brson/rust-sdl.git [submodule "src/rust-azure"] path = src/rust-azure url = git://github.com/brson/rust-azure.git @@ -13,15 +10,9 @@ [submodule "src/rust-mozjs"] path = src/rust-mozjs url = git://github.com/brson/rust-mozjs.git -[submodule "src/harfbuzz"] - path = src/harfbuzz - url = git://github.com/brson/harfbuzz-servo.git [submodule "src/rust-harfbuzz"] path = src/rust-harfbuzz url = git://github.com/brson/rust-harfbuzz.git -[submodule "src/ragel"] - path = src/ragel - url = git://github.com/brson/ragel-dist.git [submodule "src/rust-stb-image"] path = src/rust-stb-image url = git://github.com/pcwalton/rust-stb-image.git diff --git a/Makefile.in b/Makefile.in index 2ea005d25ab..c591a969d6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,6 @@ RUSTLIBS = \ -L src/rust-harfbuzz \ -L src/rust-mozjs \ -L src/rust-azure \ - -L src/rust-sdl \ -L src/rust-cocoa \ -L src/rust-stb-image \ -L src/rust-geom \ @@ -63,7 +62,6 @@ SERVO_DEPS += \ src/rust-harfbuzz/libharfbuzz.dummy \ src/rust-mozjs/libmozjs.dummy \ src/rust-azure/libazure.dummy \ - src/rust-sdl/libsdl.dummy \ src/rust-stb-image/libstb-image.dummy \ src/rust-geom/libgeom.dummy \ src/rust-opengles/libopengles.dummy \ @@ -75,7 +73,6 @@ SERVO_DEPS += \ CHECK_DEPS += \ check-rust-harfbuzz \ check-rust-mozjs \ - check-rust-sdl \ check-rust-azure \ check-rust-stb-image \ check-rust-geom \ @@ -90,7 +87,6 @@ CLEAN_DEPS += \ clean-rust-harfbuzz \ clean-mozjs \ clean-rust-mozjs \ - clean-rust-sdl \ clean-rust-azure \ clean-rust-stb-image \ clean-rust-geom \ @@ -126,9 +122,6 @@ src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a src/rust-azure/libazure.dummy: $(AZURE_DEPS) RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) -C src/rust-azure -src/rust-sdl/libsdl.dummy: - $(MAKE) -C src/rust-sdl - src/rust-cocoa/libcocoa.dummy: $(MAKE) -C src/rust-cocoa @@ -169,10 +162,6 @@ check-rust-mozjs: src/mozjs/libjs_static.a check-rust-azure: $(AZURE_DEPS) RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) check -C src/rust-azure -.PHONY: check-rust-sdl -check-rust-sdl: - $(MAKE) check -C src/rust-sdl - .PHONY: check-rust-cocoa check-rust-cocoa: $(MAKE) check -C src/rust-cocoa @@ -221,10 +210,6 @@ clean-rust-mozjs: clean-rust-azure: $(MAKE) clean -C src/rust-azure -.PHONY: clean-rust-sdl -clean-rust-sdl: - $(MAKE) clean -C src/rust-sdl - .PHONY: clean-rust-cocoa clean-rust-cocoa: $(MAKE) clean -C src/rust-cocoa @@ -261,12 +246,10 @@ ifeq ($(OSTYPE),darwin) package: servo mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa - mkdir -p Servo.app/Contents/MacOS/src/rust-sdl mkdir -p Servo.app/Contents/MacOS/src/rust-azure cp $(VPATH)/Info.plist Servo.app/Contents/ cp servo Servo.app/Contents/MacOS/ cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/ - cp src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/ cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/ else diff --git a/src/harfbuzz b/src/harfbuzz deleted file mode 160000 index cd9478610c7..00000000000 --- a/src/harfbuzz +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd9478610c792270490b479db1413d74113f587a diff --git a/src/ragel b/src/ragel deleted file mode 160000 index c2cf0a2438c..00000000000 --- a/src/ragel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2cf0a2438cdc2c50261613613d0c3e523338c0f diff --git a/src/rust-sdl b/src/rust-sdl deleted file mode 160000 index af4cb2481c6..00000000000 --- a/src/rust-sdl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit af4cb2481c60688d6b10dd8d5e2ffd6842a28384 diff --git a/src/servo/servo.rc b/src/servo/servo.rc index 58883cb8c3c..dd4408e2215 100755 --- a/src/servo/servo.rc +++ b/src/servo/servo.rc @@ -8,7 +8,6 @@ #[crate_type = "lib"]; use std; -use sdl; use azure; use js; use stb_image;