Skip to content

Commit

Permalink
1) Modified component lib to load proxy lib from dll
Browse files Browse the repository at this point in the history
2) If no embedded host is available, we add a tiny local data connection host implementation
3) Fixed minor bugs that arised for the tiny local host which does not provide a uniqueId pointer
  • Loading branch information
hkbinaurics committed Aug 26, 2023
1 parent 1ed87c2 commit 5962814
Show file tree
Hide file tree
Showing 7 changed files with 238 additions and 112 deletions.
5 changes: 4 additions & 1 deletion sources/jvxLibraries/ayf-component-lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src

${JVX_BASE_LIBS_INCLUDE_PATH}/jvx-component-templates-base/include
${JVX_BASE_BINARY_DIR}/sources/jvxLibraries/jvx-component-templates-base/generated
# ${JVX_SUBPRODUCT_LIBS_INCLUDE_PATH}/ayf-shared-connection-host/include
${JVX_SUBPRODUCT_LIBS_INCLUDE_PATH}/ayf-embedding-proxy/include
)
Expand All @@ -25,8 +26,10 @@ set(LOCAL_PCG_FILES
${CMAKE_CURRENT_SOURCE_DIR}/pcg/CayfComponentLib.pcg)

set(LOCAL_LIBS

# Both libraries loaded at runtime via LOADLIBRARY:
# ayf-shared-connection-host_import
ayf-embedding-proxy_import
# ayf-embedding-proxy_import
)

set(BUILD_STATIC TRUE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
#include "jvx.h"

#include "ayf-embedding-proxy.h"
#include "ayf-embedding-proxy-entries.h"

class myLocalHost;

class CayfComponentLib :
public IjvxNode,
public CjvxObject,
Expand Down Expand Up @@ -58,7 +61,7 @@ class CayfComponentLib :
};


IjvxMinHost* host = nullptr;
IjvxMinHost* minHostRef = nullptr;
IjvxHiddenInterface* hostRef = nullptr;

jvxSize uId_process = JVX_SIZE_UNSELECTED;
Expand Down Expand Up @@ -90,6 +93,12 @@ class CayfComponentLib :

std::string rootPath;

myLocalHost* locHost = nullptr;
IjvxHiddenInterface* localAllocatedHost = nullptr;

JVX_HMODULE proxyLibHandle = JVX_HMODULE_INVALID;
ayfEmbeddingProxyReferences proxyReferences;

public:
CayfComponentLib(JVX_CONSTRUCTOR_ARGUMENTS_MACRO_DECLARE);
~CayfComponentLib();
Expand Down
Loading

0 comments on commit 5962814

Please sign in to comment.