aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-05-06 16:56:20 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-05-06 16:56:20 +0200
commit2d97e0380feb90aa802bc1e56aad0936eda8cc81 (patch)
treefa048fdf0625a766d7f624db02234f984a6fd565
parent9d6482e636443a1c599976a6d8f588df5b5b6699 (diff)
parent430ae43528c697ee8601ad0b7c3319e887ed0555 (diff)
downloadglutin-2d97e0380feb90aa802bc1e56aad0936eda8cc81.tar.gz
glutin-2d97e0380feb90aa802bc1e56aad0936eda8cc81.zip
Merge pull request #429 from tomaka/remove-headless
[Breaking change] Remove the "headless" feature entirely
-rw-r--r--.travis.yml1
-rw-r--r--Cargo.toml1
-rw-r--r--appveyor.yml3
-rw-r--r--src/lib.rs2
4 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index c8c0ae3..1551440 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ env:
script:
- cargo build --verbose
- cargo test --verbose
- - cargo test --verbose --features "headless" --no-default-features
os:
- linux
diff --git a/Cargo.toml b/Cargo.toml
index c73b81d..50f067f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,6 @@ build = "build.rs"
[features]
default = ["window"]
window = []
-headless = []
[dependencies]
gl_common = "*"
diff --git a/appveyor.yml b/appveyor.yml
index b7a558c..cc2c0d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,5 +9,4 @@ install:
build: false
test_script:
- - cargo test --verbose --no-default-features --features "window"
- - cargo test --verbose --no-default-features --features "headless"
+ - cargo test --verbose
diff --git a/src/lib.rs b/src/lib.rs
index d52077d..974ef0b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,7 +53,6 @@ extern crate glutin_core_graphics as core_graphics;
extern crate x11;
pub use events::*;
-#[cfg(feature = "headless")]
pub use headless::{HeadlessRendererBuilder, HeadlessContext};
#[cfg(feature = "window")]
pub use window::{WindowBuilder, Window, WindowProxy, PollEventsIterator, WaitEventsIterator};
@@ -65,7 +64,6 @@ pub use native_monitor::NativeMonitorId;
mod api;
mod platform;
mod events;
-#[cfg(feature = "headless")]
mod headless;
#[cfg(feature = "window")]
mod window;