Modified code to cross link core lib and flutter code in starter proj…

…ect to align to Linux
jvxgit · May 29, 2024 · 6185a8c · 6185a8c
1 parent 6fb257b
commit 6185a8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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(