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

auto merge of #4672 : glennw/servo/make-glutin-default, r=larsbergstrom

Browse source 
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.
This commit is contained in:
bors-servo 2015-01-19 16:30:47 -07:00
commit ccf5f96fa9
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/Cargo.toml
View file

@ -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"

4
components/servo/main.rs
View file

@ -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))]