From b81f915dcd9071667d9bb7a86c2ada5829ba8a39 Mon Sep 17 00:00:00 2001 From: Sergey Zavyalov Date: Wed, 30 Oct 2024 15:31:06 +0300 Subject: [PATCH] Previewer Windos build fix --- arkoala/framework/native/meson.build | 4 +++- arkoala/framework/native/src/library.cc | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arkoala/framework/native/meson.build b/arkoala/framework/native/meson.build index b66656ac7..857394742 100644 --- a/arkoala/framework/native/meson.build +++ b/arkoala/framework/native/meson.build @@ -4,6 +4,7 @@ project('ArkoalaNative', 'c', 'cpp', ) source_dir = meson.current_source_dir() +deps_dir = source_dir / 'deps' interop_src = '../../../interop/src/cpp' oses = { 'darwin': 'macos' } # rename meson default names to convenient ones @@ -81,8 +82,9 @@ if is_napi endif if os == 'windows' - cflags += ['-DKOALA_WINDOWS'] + cflags += ['-DKOALA_WINDOWS', '/bigobj'] ldflags += [] + ldflags += [ deps_dir / 'libace_napi.lib' ] if is_msvc and is_node # apply node.exe symbol loading hook sources += [ diff --git a/arkoala/framework/native/src/library.cc b/arkoala/framework/native/src/library.cc index b821934f2..f1f02f4bc 100644 --- a/arkoala/framework/native/src/library.cc +++ b/arkoala/framework/native/src/library.cc @@ -184,12 +184,12 @@ const ArkUIAnyAPI* GetAnyImpl(ArkUIAPIVariantKind kind, int version, std::string if (getAPI == nullptr) { void* module = FindModule(); // Note, that RTLD_DEFAULT is ((void *) 0). - getAPI = reinterpret_cast(FindFunction(module, "GetArkUINodeAPI")); + getAPI = reinterpret_cast(FindFunction(module, "GetArkUIAPI")); if (!getAPI) { if (result) - *result = "Cannot find GetArkUINodeAPI()"; + *result = "Cannot find GetArkUIAPI()"; else - ARKOALA_LOG0("Cannot find GetArkUINodeAPI()"); + ARKOALA_LOG0("Cannot find GetArkUIAPI()"); return nullptr; } } -- Gitee