From 6243e1a79550e9cff9837f5449f3b9150127b8e8 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Wed, 29 Apr 2026 15:35:56 -0500 Subject: Clean up remaining Linux packaging names --- libs/plugin_python/src/proxy/proxypython.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libs/plugin_python/src/proxy/proxypython.cpp') diff --git a/libs/plugin_python/src/proxy/proxypython.cpp b/libs/plugin_python/src/proxy/proxypython.cpp index 0037991..6e4acad 100644 --- a/libs/plugin_python/src/proxy/proxypython.cpp +++ b/libs/plugin_python/src/proxy/proxypython.cpp @@ -139,12 +139,11 @@ bool ProxyPython::init(IOrganizer* moInfo) // load the pythonrunner library, this is done in multiple steps: // - // 1. we set the dlls/ subfolder (from the plugin) as the DLL directory so Windows - // will look for DLLs in it, this is required to find the Python and libffi DLL, but - // also the runner DLL + // 1. On Windows, set the dlls/ subfolder as the DLL directory so Windows + // can find the Python, libffi, and runner DLLs. // - const auto dllPaths = pluginDataRoot / "dlls"; #ifdef _WIN32 + const auto dllPaths = pluginDataRoot / "dlls"; if (SetDllDirectoryW(dllPaths.c_str()) == 0) { DWORD error = ::GetLastError(); m_LoadFailure = FailureType::DLL_NOT_FOUND; @@ -229,7 +228,11 @@ bool ProxyPython::init(IOrganizer* moInfo) return true; // return true so the plugin stays loaded (shows diagnostic) } else { +#ifdef _WIN32 m_Runner->addDllSearchPath(pluginDataRoot / "dlls"); +#else + m_Runner->addDllSearchPath(pluginDataRoot / "libs"); +#endif } return true; -- cgit v1.3.1