fix: build error

rust-windowing · Jan 24, 2025 · 3bd7336 · 3bd7336
1 parent 631fa1f
commit 3bd7336
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/glutin-winit/Cargo.toml b/glutin-winit/Cargo.toml
@@ -21,7 +21,10 @@ wayland = ["glutin/wayland", "winit/wayland"]
 [dependencies]
 glutin = { version = "0.32.0", path = "../glutin", default-features = false }
 raw-window-handle = "0.6"
-winit = { version = "0.30.0", default-features = false, features = ["rwh_06"] }
+# winit = { version = "0.30.0", default-features = false, features = ["rwh_06"] }
+winit = { git = "https://github.com/richerfu/winit.git", branch = "feat-ohos-30", default-features = false, features = [
+    "rwh_06",
+] }
 
 [build-dependencies]
 cfg_aliases = "0.2.1"
diff --git a/glutin_examples/Cargo.toml b/glutin_examples/Cargo.toml
@@ -23,15 +23,26 @@ glutin = { path = "../glutin", default-features = false }
 glutin-winit = { path = "../glutin-winit", default-features = false }
 png = { version = "0.17.6", optional = true }
 raw-window-handle = "0.6"
-winit = { version = "0.30.0", default-features = false, features = ["rwh_06"] }
+# winit = { version = "0.30.0", default-features = false, features = ["rwh_06"] }
+winit = { git = "https://github.com/richerfu/winit.git", branch = "feat-ohos-30", default-features = false, features = [
+    "rwh_06",
+] }
 drm = { version = "0.12", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
-winit = { version = "0.30.0", default-features = false, features = ["android-native-activity", "rwh_06"] }
+# winit = { version = "0.30.0", default-features = false, features = ["android-native-activity", "rwh_06"] }
+winit = { git = "https://github.com/richerfu/winit.git", branch = "feat-ohos-30", default-features = false, features = [
+    "rwh_06",
+    "android-native-activity"
+] }
 
 [target.'cfg(target_env = "ohos")'.dependencies]
-openharmony_ability = { version = "0.0.1" }
-openharmony_ability_derive = { version = "0.0.1" }
+openharmony-ability = { version = "0.0.1" }
+openharmony-ability-derive = { version = "0.0.1" }
+winit = { git = "https://github.com/richerfu/winit.git", branch = "feat-ohos-30", default-features = false, features = [
+    "rwh_06",
+] }
+napi-ohos = {version = "1.0", features = ["napi8", "async"]}
 
 [build-dependencies]
 gl_generator = "0.14"
@@ -42,7 +53,7 @@ name = "android"
 crate-type = ["cdylib"]
 
 [[example]]
-name = "ohos_test"
+name = "ohos"
 crate-type = ["cdylib"]
 
 [[example]]

diff --git a/glutin_examples/build.rs b/glutin_examples/build.rs
@@ -12,11 +12,12 @@ fn main() {
     cfg_aliases! {
         // Systems.
         android_platform: { target_os = "android" },
+        ohos_platform: { target_env = "ohos" },
         wasm_platform: { target_family = "wasm" },
         macos_platform: { target_os = "macos" },
         ios_platform: { target_os = "ios" },
         apple: { any(ios_platform, macos_platform) },
-        free_unix: { all(unix, not(apple), not(android_platform)) },
+        free_unix: { all(unix, not(apple), not(android_platform), not(ohos_platform)) },
 
         // Native displays.
         x11_platform: { all(feature = "x11", free_unix, not(wasm_platform)) },

diff --git a/glutin_examples/examples/ohos.rs b/glutin_examples/examples/ohos.rs
@@ -6,11 +6,9 @@ use openharmony_ability_derive::ability;
 use winit::event_loop::EventLoop;
 use winit::platform::ohos::EventLoopBuilderExtOpenHarmony;
 
-mod app;
-
 #[ability]
 pub fn openharmony(openharmony_app: OpenHarmonyApp) {
     let a = openharmony_app.clone();
     let event_loop = EventLoop::builder().with_openharmony_app(a).build().unwrap();
-    app::main(event_loop).unwrap()
+    glutin_examples::main(event_loop).unwrap()
 }
diff --git a/glutin_examples/src/lib.rs b/glutin_examples/src/lib.rs
@@ -22,7 +22,7 @@ use glutin::surface::{Surface, SwapInterval, WindowSurface};
 use glutin_winit::{DisplayBuilder, GlWindow};
 
 #[cfg(target_env = "ohos")]
-use winit::platform::ohos::EventLoopBuilderExtOpenHarmony;
+use winit::platform::ohos::EventLoopExtOpenHarmony;
 
 pub mod gl {
     #![allow(clippy::all)]