Skip to content

Commit e9ec8a0

Browse files
felixf4xuU-CW01\uig08771fujitatomoya
authored
load dll built by MINGW with lib prefix (ros2#470)
* load dll built by MINGW with lib prefix Signed-off-by: U-CW01\uig08771 <uig08771@HIL4255W.cw01.contiwan.com> * Update src/shared_library.c Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Signed-off-by: Felix F Xu <84662027+felixf4xu@users.noreply.github.com> --------- Signed-off-by: U-CW01\uig08771 <uig08771@HIL4255W.cw01.contiwan.com> Signed-off-by: Felix F Xu <84662027+felixf4xu@users.noreply.github.com> Co-authored-by: U-CW01\uig08771 <uig08771@HIL4255W.cw01.contiwan.com> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
1 parent b2ad5ed commit e9ec8a0

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

src/shared_library.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,19 @@ rcutils_get_platform_library_name(
319319
}
320320
}
321321
#elif _WIN32
322+
#ifdef __MINGW64__
323+
if (debug) {
324+
if (buffer_size >= (strlen(library_name) + 9)) {
325+
written = rcutils_snprintf(
326+
library_name_platform, strlen(library_name) + 9, "lib%sd.dll", library_name);
327+
}
328+
} else {
329+
if (buffer_size >= (strlen(library_name) + 8)) {
330+
written = rcutils_snprintf(
331+
library_name_platform, strlen(library_name) + 8, "lib%s.dll", library_name);
332+
}
333+
}
334+
#else
322335
if (debug) {
323336
if (buffer_size >= (strlen(library_name) + 6)) {
324337
written = rcutils_snprintf(
@@ -330,6 +343,7 @@ rcutils_get_platform_library_name(
330343
library_name_platform, strlen(library_name) + 5, "%s.dll", library_name);
331344
}
332345
}
346+
#endif // __MINGW64__
333347
#endif
334348
if (written <= 0) {
335349
RCUTILS_SET_ERROR_MSG_WITH_FORMAT_STRING(

0 commit comments

Comments
 (0)