Fixed Python dynamic API under Linux & improved Python autodiscovery

pawelsalawa · Dec 2, 2024 · 1855e70 · 1855e70
1 parent fe03189
commit 1855e70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Plugins/ScriptingPython/dynamicpythonapi.h b/Plugins/ScriptingPython/dynamicpythonapi.h
@@ -38,6 +38,7 @@ extern PyObject* PyFrame_GetLocals(PyFrameObject*);
     PYAPI_METHOD(Py_IncRef) \
     PYAPI_METHOD(Py_Initialize) \
     PYAPI_METHOD(Py_NewInterpreter) \
+    PYAPI_METHOD(PyThreadState_GetFrame) \
     PYAPI_METHOD(PyBool_FromLong) \
     PYAPI_METHOD(PyByteArray_AsString) \
     PYAPI_METHOD(PyByteArray_Size) \

diff --git a/Plugins/ScriptingPython/scriptingpython.cpp b/Plugins/ScriptingPython/scriptingpython.cpp
@@ -216,7 +216,7 @@ QStringList ScriptingPython::discoverLibraries() const
         {"/Library/Frameworks/Python.framework/Versions/"}, {"*"}, {"/Python"}
 #elif defined(Q_OS_UNIX)
         QStringList({"", "/usr", "/usr/local", "/usr/pkg"}) + dirNames(pathEnv),
-        {"/lib/", "/lib64/"}, {"libpython*.so*"}
+        {"/lib/", "/lib64/", "/lib/x86_64-linux-gnu/", "/lib64/x86_64-linux-gnu/", "/lib/x86-linux-gnu/"}, {"libpython*.so*"}
 #elif defined(Q_OS_WINDOWS)
         QStringList({QDir::homePath() + "/AppData/Local/Programs/Python"}) + pathEnv,
         {"", "/bin", "/lib"}, {"*python*.dll"}