Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions robotpy_build/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,17 @@ def _all_library_dirs(self):
return libs

def _all_library_names(self):
libs = list(
set(self.get_library_names()) | set(self.get_dlopen_library_names())
)
libs = []
[libs.append(lib) for lib in self.get_library_names() if lib not in libs]
[libs.append(lib) for lib in self.get_dlopen_library_names() if lib not in libs]
dep_libs = []
for dep in self.cfg.depends:
pkg = self.pkgcfg.get_pkg(dep)
libnames = pkg.get_library_names()
if libnames:
libs.extend(libnames)
return list(reversed(libs))
[dep_libs.append(lib) for lib in libnames if lib not in libs]
libs.extend(reversed(dep_libs))
return libs

def _all_extra_objects(self):
libs = []
Expand Down
Loading