From 767b9f28f572c80bec2593b9f4c5f74cd0ed6a4d Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 24 Oct 2022 09:06:11 +0200 Subject: [PATCH] CON-276: Updated loading of redist + commit of submodule (#144) (cherry picked from commit a0e4f41786952c2297af850227e29d62ba6999de) --- rticonnextdds-connector | 2 +- rticonnextdds_connector/rticonnextdds_connector.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rticonnextdds-connector b/rticonnextdds-connector index 81b374f..b1f841d 160000 --- a/rticonnextdds-connector +++ b/rticonnextdds-connector @@ -1 +1 @@ -Subproject commit 81b374f2f2e86127d1e03be9e9ceadcd21d4ae69 +Subproject commit b1f841d38ff6e22040645f862bcf9ab9297b5a11 diff --git a/rticonnextdds_connector/rticonnextdds_connector.py b/rticonnextdds_connector/rticonnextdds_connector.py index 4316199..75463c6 100644 --- a/rticonnextdds_connector/rticonnextdds_connector.py +++ b/rticonnextdds_connector/rticonnextdds_connector.py @@ -139,7 +139,7 @@ def __init__(self): # pylint: disable=too-many-statements directory = "win-x64" libname = "rtiddsconnector" post = "dll" - additional_lib = "msvcr120" + additional_lib = "vcruntime140.dll" is_windows = True else: raise RuntimeError("This platform ({0}) is not supported".format(osname))