Merge branch 'master' of http://github.com/tomaka/gl-init-rs

2 files changed, 13 insertions, 3 deletions

diff --git a/src/platform/emscripten/mod.rs b/src/platform/emscripten/mod.rs
index 270cdaf..1a78dfb 100644
--- a/src/platform/emscripten/mod.rs
+++ b/src/platform/emscripten/mod.rs
@@ -1,7 +1,12 @@
 #![cfg(target_os = "emscripten")]
 
+use Api;
 use ContextError;
+use CreationError;
+use GlAttributes;
 use GlContext;
+use PixelFormat;
+use PixelFormatRequirements;
 
 pub use api::emscripten::{Window, WindowProxy, MonitorId, get_available_monitors};
 pub use api::emscripten::{get_primary_monitor, WaitEventsIterator, PollEventsIterator};
@@ -11,8 +16,10 @@ pub struct HeadlessContext(Window);
 impl HeadlessContext {
     /// See the docs in the crate root file.
     #[inline]
-    pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
-        Window::new(builder).map(|w| HeadlessContext(w))
+    pub fn new(_: (u32, u32), _: &PixelFormatRequirements, _: &GlAttributes<&HeadlessContext>)
+               -> Result<HeadlessContext, CreationError>
+    {
+        unimplemented!()
     }
 }
 
diff --git a/src/platform/mod.rs b/src/platform/mod.rs
index 4855765..8527da2 100644
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -15,8 +15,11 @@ mod platform;
 #[cfg(target_os = "ios")]
 #[path="ios/mod.rs"]
 mod platform;
+#[cfg(target_os = "emscripten")]
+#[path="emscripten/mod.rs"]
+mod platform;
 
 #[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
   not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
-  not(target_os = "freebsd")))]
+  not(target_os = "freebsd"), not(target_os = "emscripten")))]
 use this_platform_is_not_supported;