Remove the glfw port (it doesn't compile since last rustup anyway).

This commit is contained in:
Glenn Watson 2015-02-02 09:40:24 +10:00
parent ccdf0bd65e
commit f495884dcb
12 changed files with 10 additions and 744 deletions

View file

@ -1,18 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
//! Platform-specific functionality for Servo.
#[cfg(target_os="android")]
pub use platform::common::glut_windowing::{Application, Window};
#[cfg(not(target_os="android"))]
pub use platform::common::glfw_windowing::{Application, Window};
pub mod common {
#[cfg(target_os="android")]
pub mod glut_windowing;
#[cfg(not(target_os="android"))]
pub mod glfw_windowing;
}

View file

@ -59,7 +59,7 @@ pub enum KeyState {
Repeated,
}
//N.B. Straight up copied from glfw-rs
//N.B. Based on the glutin key enum
#[derive(Show, PartialEq, Eq, Copy, Clone)]
pub enum Key {
Space,

View file

@ -6,7 +6,6 @@ dependencies = [
"compositing 0.0.1",
"devtools 0.0.1",
"gfx 0.0.1",
"glfw_app 0.0.1",
"glutin_app 0.0.1",
"layout 0.0.1",
"msg 0.0.1",
@ -332,36 +331,6 @@ dependencies = [
"gl_generator 0.0.12 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
name = "glfw"
version = "0.0.1"
source = "git+https://github.com/servo/glfw-rs?branch=servo#907db700166b48e71d7d59b1eb9964b874c7ca42"
dependencies = [
"glfw-sys 3.0.4 (git+https://github.com/servo/glfw?branch=cargo-3.0.4)",
"log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "glfw-sys"
version = "3.0.4"
source = "git+https://github.com/servo/glfw?branch=cargo-3.0.4#765dace7e4125b87c764f5ac0e7a80eae5c550b2"
[[package]]
name = "glfw_app"
version = "0.0.1"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glfw 0.0.1 (git+https://github.com/servo/glfw-rs?branch=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
"time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
[[package]]
name = "glutin"
version = "0.0.4-pre"
@ -711,11 +680,6 @@ dependencies = [
"util 0.0.1",
]
[[package]]
name = "semver"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "skia-sys"
version = "0.0.20130412"

View file

@ -30,8 +30,7 @@ path = "../../tests/contenttest.rs"
harness = false
[features]
default = ["glutin_app", "window"]
glfw = ["glfw_app"]
default = ["window"]
window = ["glutin_app/window"]
headless = ["glutin_app/headless"]
@ -59,13 +58,8 @@ path = "../gfx"
[dependencies.devtools]
path = "../devtools"
[dependencies.glfw_app]
path = "../../ports/glfw"
optional = true
[dependencies.glutin_app]
path = "../../ports/glutin"
optional = true
[dependencies.android_glue]
path = "../../support/android-rs-glue/glue"

View file

@ -13,10 +13,8 @@ extern crate servo;
extern crate time;
extern crate util;
#[cfg(all(feature = "glutin_app",not(test)))]
#[cfg(not(test))]
extern crate "glutin_app" as app;
#[cfg(all(feature = "glfw",not(test)))]
extern crate "glfw_app" as app;
#[cfg(not(test))]
extern crate compositing;