Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CON-276: Updated loading of redist + commit of submodule #144

Merged
merged 1 commit into from
Oct 24, 2022
Merged

CON-276: Updated loading of redist + commit of submodule #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rticonnextdds-connector
Open in desktop
Submodule rticonnextdds-connector updated 17 files
+ − lib/linux-arm/libnddsc.so
+ − lib/linux-arm/libnddscore.so
+ − lib/linux-arm/librtiddsconnector.so
+ − lib/linux-arm64/libnddsc.so
+ − lib/linux-arm64/libnddscore.so
+ − lib/linux-arm64/librtiddsconnector.so
+ − lib/linux-x64/libnddsc.so
+ − lib/linux-x64/libnddscore.so
+ − lib/linux-x64/librtiddsconnector.so
+ − lib/osx-x64/libnddsc.dylib
+ − lib/osx-x64/libnddscore.dylib
+ − lib/osx-x64/librtiddsconnector.dylib
+ − lib/win-x64/msvcr120.dll
+ − lib/win-x64/nddsc.dll
+ − lib/win-x64/nddscore.dll
+ − lib/win-x64/rtiddsconnector.dll
+ − lib/win-x64/vcruntime140.dll
2 changes: 1 addition & 1 deletion rticonnextdds_connector/rticonnextdds_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def __init__(self): # pylint: disable=too-many-statements
directory = "win-x64"
libname = "rtiddsconnector"
post = "dll"
additional_lib = "msvcr120"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why we didn't provide the .dll suffix previously. Looks to me like it is necessary at least.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need the extension. The OS calls usually work with and without.

additional_lib = "vcruntime140.dll"
is_windows = True
else:
raise RuntimeError("This platform ({0}) is not supported".format(osname))
Expand Down