From 01773b92ebcf9cf1e214bfc4d7b3a7934ffae16c Mon Sep 17 00:00:00 2001 From: luwh0708 <1632083718@qq.com> Date: Tue, 5 Apr 2022 19:54:42 +0800 Subject: [PATCH 1/2] flutter adapt mingw Change-Id: Ic5c26bbd3b4e2fb4406db183f7ab70d9cd5d63cc Signed-off-by: luwh0708 <1632083718@qq.com> --- engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc | 2 +- engine/flutter/shell/platform/ohos/vsync_waiter_embedder.h | 2 +- engine/flutter/third_party/txt/src/utils/WindowsUtils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc b/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc index 4d828fef..8c888ecd 100644 --- a/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc +++ b/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc @@ -81,7 +81,7 @@ void VsyncWaiterEmbedder::AwaitVSync() std::weak_ptr weak_base(shared_from_this()); CallbackInfo* info = new CallbackInfo{ refreshPeriod_, fps_, weak_base }; #ifdef OHOS_STANDARD_SYSTEM - std::weak_ptr weakReceiver = vsyncReceiver_; + std::weak_ptr weakReceiver = vsyncReceiver_; task_runners_.GetPlatformTaskRunner()->PostTask([weakReceiver, info]() { OHOS::Rosen::VSyncReceiver::FrameCallback fcb = { .userData_ = info, diff --git a/engine/flutter/shell/platform/ohos/vsync_waiter_embedder.h b/engine/flutter/shell/platform/ohos/vsync_waiter_embedder.h index a219afc3..8954ee01 100644 --- a/engine/flutter/shell/platform/ohos/vsync_waiter_embedder.h +++ b/engine/flutter/shell/platform/ohos/vsync_waiter_embedder.h @@ -45,7 +45,7 @@ private: int64_t refreshPeriod_ = 0; - std::shared_ptr vsyncReceiver_ = nullptr; + std::shared_ptr vsyncReceiver_ = nullptr; FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterEmbedder); }; diff --git a/engine/flutter/third_party/txt/src/utils/WindowsUtils.h b/engine/flutter/third_party/txt/src/utils/WindowsUtils.h index 323b2376..24d250e4 100644 --- a/engine/flutter/third_party/txt/src/utils/WindowsUtils.h +++ b/engine/flutter/third_party/txt/src/utils/WindowsUtils.h @@ -27,7 +27,7 @@ #define NOMINMAX // ACE PC preivew. -#ifdef WINDOWS_PLATFORM +#if defined(WINDOWS_PLATFORM) || defined(OS_mingw) #include #else #include -- Gitee From 4d8f8cf98701698e2b1e462610b496d244e6ec3f Mon Sep 17 00:00:00 2001 From: luwh0708 <1632083718@qq.com> Date: Sun, 1 May 2022 20:28:34 +0800 Subject: [PATCH 2/2] glfw adapt mingw Change-Id: If2bfb6ac257a71b168a33d773ff861e6cea18cba Signed-off-by: luwh0708 <1632083718@qq.com> --- glfw/BUILD.gn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glfw/BUILD.gn b/glfw/BUILD.gn index 075f4277..adf98ba9 100644 --- a/glfw/BUILD.gn +++ b/glfw/BUILD.gn @@ -50,6 +50,11 @@ template("glfw") { ] defines += [ "_GLFW_WIN32" ] + + libs = [ + "gdi32", + "opengl32", + ] } if (platform == "mac") { sources += [ -- Gitee