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

Jump to bottom

Append .so to plugin names. #555

Merged
merged 1 commit into from
Dec 29, 2022
Merged

Append .so to plugin names. #555

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
14 changes: 13 additions & 1 deletion Server/Components/Pawn/Plugin/Plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,21 @@ PawnPlugin::PawnPlugin(std::string const& path, ICore* core)
: serverCore(core)
{
#ifdef WIN32
// Windows doesn't need the extension.
pluginHandle_ = LoadLibraryA(path.c_str());
#else
pluginHandle_ = dlopen(path.c_str(), RTLD_LAZY);
size_t pos = path.find_last_of(".so");
// You would think this could be done in one comparison, but the path may
// only be two characters long.
if (pos == std::string::npos || pos + 3 != path.length())
{
// Append the extension.
pluginHandle_ = dlopen((path + ".so").c_str(), RTLD_LAZY);
}
else
{
pluginHandle_ = dlopen(path.c_str(), RTLD_LAZY);
}
#endif // WIN32

if (pluginHandle_ == nullptr)
Expand Down