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/installer_fomod/src/installer_fomod_en.ts | 2 +- libs/installer_fomod/src/installerfomod.cpp | 2 +- libs/plugin_python/src/proxy/CMakeLists.txt | 6 ++---- libs/plugin_python/src/proxy/proxypython.cpp | 11 +++++++---- libs/plugin_python/src/runner/pythonrunner.cpp | 4 ++-- libs/plugin_python/src/runner/pythonrunner.h | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) (limited to 'libs') diff --git a/libs/installer_fomod/src/installer_fomod_en.ts b/libs/installer_fomod/src/installer_fomod_en.ts index 98c5d97..674f2c9 100644 --- a/libs/installer_fomod/src/installer_fomod_en.ts +++ b/libs/installer_fomod/src/installer_fomod_en.ts @@ -267,7 +267,7 @@ - This indicates that files from dlls/imageformats are missing from your MO installation or outdated. Images in installers may not be displayed. Please re-install MO + This indicates that Qt image format plugins are missing from your MO installation or outdated. Images in installers may not be displayed. Please re-install MO diff --git a/libs/installer_fomod/src/installerfomod.cpp b/libs/installer_fomod/src/installerfomod.cpp index 8be3ca3..239ec9a 100644 --- a/libs/installer_fomod/src/installerfomod.cpp +++ b/libs/installer_fomod/src/installerfomod.cpp @@ -286,7 +286,7 @@ QString InstallerFomod::fullDescription(unsigned int key) const { switch (key) { case PROBLEM_IMAGETYPE_UNSUPPORTED: - return tr("This indicates that files from dlls/imageformats are missing from your " + return tr("This indicates that Qt image format plugins are missing from your " "MO installation or outdated. " "Images in installers may not be displayed. Please re-install MO"); default: diff --git a/libs/plugin_python/src/proxy/CMakeLists.txt b/libs/plugin_python/src/proxy/CMakeLists.txt index ed212a3..f7e6f31 100644 --- a/libs/plugin_python/src/proxy/CMakeLists.txt +++ b/libs/plugin_python/src/proxy/CMakeLists.txt @@ -96,19 +96,17 @@ if(NOT WIN32) # Build-tree runtime layout expected by proxypython.cpp. add_custom_command(TARGET proxy POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/src/plugins" - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/src/plugins/dlls" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/src/plugins/libs" - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/src/plugins/plugin_python/dlls" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/src/plugins/plugin_python/libs" COMMAND ${CMAKE_COMMAND} -E copy_if_different "$" "${CMAKE_BINARY_DIR}/src/src/plugins/$" COMMAND ${CMAKE_COMMAND} -E copy_if_different "$" - "${CMAKE_BINARY_DIR}/src/src/plugins/dlls/$" + "${CMAKE_BINARY_DIR}/src/src/plugins/libs/$" COMMAND ${CMAKE_COMMAND} -E copy_if_different "$" - "${CMAKE_BINARY_DIR}/src/src/plugins/plugin_python/dlls/$" + "${CMAKE_BINARY_DIR}/src/src/plugins/plugin_python/libs/$" COMMAND ${CMAKE_COMMAND} -E copy_if_different "$" "${CMAKE_BINARY_DIR}/src/src/plugins/libs/$" 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; diff --git a/libs/plugin_python/src/runner/pythonrunner.cpp b/libs/plugin_python/src/runner/pythonrunner.cpp index c630530..d74db4c 100644 --- a/libs/plugin_python/src/runner/pythonrunner.cpp +++ b/libs/plugin_python/src/runner/pythonrunner.cpp @@ -300,8 +300,8 @@ namespace mo2::python { #ifdef _WIN32 py::module_::import("os").attr("add_dll_directory")(absolute(dllPath)); #else - // On Linux, there is no add_dll_directory equivalent; prepend the folder to - // sys.path so Python extension modules can be found. + // On Linux, prepend the folder to sys.path so Python extension modules + // can be found. ensureFolderInPath(QString::fromStdString(absolute(dllPath).string())); #endif } diff --git a/libs/plugin_python/src/runner/pythonrunner.h b/libs/plugin_python/src/runner/pythonrunner.h index 5f9751b..71a4bb9 100644 --- a/libs/plugin_python/src/runner/pythonrunner.h +++ b/libs/plugin_python/src/runner/pythonrunner.h @@ -33,7 +33,7 @@ namespace mo2::python { virtual bool initialize(std::vector const& pythonPaths = {}) = 0; - // add a DLL search path + // add a native extension/library search path // virtual void addDllSearchPath(std::filesystem::path const& dllPath) = 0; -- cgit v1.3.1