Skip to content

Enhance extension loading #132

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

Merged
X39 merged 2 commits into from
Nov 18, 2020
Merged

Enhance extension loading #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5861b26
Fix extension loaded multiple times in Linux
dextercd Nov 14, 2020
04cc519
Load extensions with _x64 suffix when compiled for 64 bits
dextercd Nov 14, 2020
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
20 changes: 14 additions & 6 deletions src/operators/ops_generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,19 +1369,27 @@ namespace

std::shared_ptr<dlops> helpermethod_callextension_loadlibrary(runtime& runtime, std::string name)
{
std::string dlname = name;

#ifdef ENVIRONMENT64
dlname += "_x64";
#endif

#ifndef _WIN32 // Append .so for Linux
dlname += ".so";
#endif

static char buffer[CALLEXTVERSIONBUFFSIZE + 1] = { 0 };
for (auto it : runtime.storage<dlops, sqf::operators::dlops_storage>())
{
if (it->path() == name)
if (it->path() == dlname)
{
return it;
}
}
#ifdef _WIN32
auto dl = std::make_shared<dlops>(name);
#else
auto dl = std::make_shared<dlops>(name + ".so");
#endif

auto dl = std::make_shared<dlops>(dlname);

runtime.storage<dlops, sqf::operators::dlops_storage>().push_back(dl);
void* sym = nullptr;
if (dl->try_resolve("RVExtensionVersion", &sym))
Expand Down