diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-19 16:30:47 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-19 16:30:47 -0700 |
| commit | ccf5f96fa91540ca73cfb24dd130d5124975fc6e (patch) | |
| tree | 271394dd84980920dbe9b0642cb69613645e7304 /components/servo | |
| parent | 1e85bb67b24483d08edfdc868454fd86dee3ece8 (diff) | |
| parent | a2a74cbb4ff09715c39f270b4bee82cd0459ee64 (diff) | |
| download | servo-ccf5f96fa91540ca73cfb24dd130d5124975fc6e.tar.gz servo-ccf5f96fa91540ca73cfb24dd130d5124975fc6e.zip | |
auto merge of #4672 : glennw/servo/make-glutin-default, r=larsbergstrom
This change makes glutin the default windowing system on mac/linux.
If you run into any issues with the glutin system, you can temporarily
build the GLFW system with the following command:
cd components/servo
../../mach cargo build --no-default-features --features=glfw
Once any glutin related issues have been sorted out, the GLFW
port will be removed.
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/servo/main.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 52bdb2b6f31..f42178bb90f 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -27,8 +27,8 @@ path = "../../tests/contenttest.rs" harness = false [features] -default = ["glfw_app"] -glutin = ["glutin_app"] +default = ["glutin_app"] +glfw = ["glfw_app"] [dependencies.compositing] path = "../compositing" diff --git a/components/servo/main.rs b/components/servo/main.rs index 235b455ab32..81723d64b04 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -14,9 +14,9 @@ extern crate servo; extern crate time; extern crate "util" as servo_util; -#[cfg(all(feature = "glutin",not(test)))] +#[cfg(all(feature = "glutin_app",not(test)))] extern crate "glutin_app" as app; -#[cfg(all(feature = "glfw_app",not(test)))] +#[cfg(all(feature = "glfw",not(test)))] extern crate "glfw_app" as app; #[cfg(not(test))] |