From 6185a8cf33a184efb7e1681db0dbb08c9bb71cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hauke=20Kr=C3=BCger?= Date: Wed, 29 May 2024 14:27:25 +0200 Subject: [PATCH] Modified code to cross link core lib and flutter code in starter project to align to Linux --- .../flutter/ayf_starter_corepack/windows/CMakeLists.txt | 3 +++ .../ayf_starter_corepack/windows/ayfcorepack_plugin.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt index c0112873..d7dab701 100644 --- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt +++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt @@ -97,6 +97,9 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE # This is the minimum package libs aggregation: ${AYF_CORE_PACK_LIB} + # We need this lib to derive the module name + jvx-system-base_static.lib + # These packages would be necessary otherwise # jvx-helpers_static.lib # jvx-system-min_static.lib diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp index d13ecd33..2b64b932 100644 --- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp +++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/ayfcorepack_plugin.cpp @@ -55,7 +55,8 @@ void AyfcorepackPlugin::HandleMethodCall( else if (method_call.method_name().compare("getEntryPoints") == 0) { flutter::EncodableMap retMap; - retMap[flutter::EncodableValue("loadedModule")] = flutter::EncodableValue(ayfcorepack::AyfcorepackPlugin::fileNameModule); + std::string externalAccessModuleName = JVX_GET_CURRENT_MODULE_PATH(flutter_config_open); + retMap[flutter::EncodableValue("loadedModule")] = flutter::EncodableValue(externalAccessModuleName); /* * Do not activatze this part since it requires extra libs to be included retMap[flutter::EncodableValue("loadedModuleShort")] = flutter::EncodableValue(