Merge pull request #393 from tomaka/reorganization

Create reorganization

src/api/android/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(target_os = "android")]
+
 extern crate android_glue;
 
 use libc;

src/api/cocoa/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(target_os = "macos")]
+
 #[cfg(feature = "headless")]
 pub use self::headless::HeadlessContext;
 

src/api/mod.rs

@@ -0,0 +1,4 @@
+pub mod android;
+pub mod cocoa;
+pub mod win32;
+pub mod x11;

src/api/win32/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(target_os = "windows")]
+
 use std::sync::atomic::AtomicBool;
 use std::mem;
 use std::ptr;

src/api/x11/mod.rs

@@ -1,3 +1,5 @@
+#![cfg(target_os = "linux")]
+
 #[cfg(feature = "headless")]
 pub use self::headless::HeadlessContext;
 

src/lib.rs

@@ -61,22 +61,8 @@ pub use window::{AvailableMonitorsIter, MonitorID, get_available_monitors, get_p
 #[cfg(feature = "window")]
 pub use native_monitor::NativeMonitorId;
 
-#[cfg(all(not(target_os = "windows"), not(target_os = "linux"), not(target_os = "macos"), not(target_os = "android")))]
+mod api;
-use this_platform_is_not_supported;
-
-#[cfg(target_os = "windows")]
-#[path="win32/mod.rs"]
 mod platform;
-#[cfg(target_os = "linux")]
-#[path="x11/mod.rs"]
-mod platform;
-#[cfg(target_os = "macos")]
-#[path="cocoa/mod.rs"]
-mod platform;
-#[cfg(target_os = "android")]
-#[path="android/mod.rs"]
-mod platform;
-
 mod events;
 #[cfg(feature = "headless")]
 mod headless;

src/platform/android/mod.rs

@@ -0,0 +1,3 @@
+#![cfg(target_os = "android")]
+
+pub use api::android::*;

src/platform/linux/mod.rs

@@ -0,0 +1,3 @@
+#![cfg(target_os = "linux")]
+
+pub use api::x11::*;

src/platform/macos/mod.rs

@@ -0,0 +1,3 @@
+#![cfg(target_os = "macos")]
+
+pub use api::cocoa::*;

src/platform/mod.rs

@@ -0,0 +1,17 @@
+pub use self::platform::*;
+
+#[cfg(target_os = "windows")]
+#[path="windows/mod.rs"]
+mod platform;
+#[cfg(target_os = "linux")]
+#[path="linux/mod.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path="macos/mod.rs"]
+mod platform;
+#[cfg(target_os = "android")]
+#[path="android/mod.rs"]
+mod platform;
+
+#[cfg(all(not(target_os = "windows"), not(target_os = "linux"), not(target_os = "macos"), not(target_os = "android")))]
+use this_platform_is_not_supported;

src/platform/windows/mod.rs

@@ -0,0 +1,3 @@
+#![cfg(target_os = "windows")]
+
+pub use api::win32::*;