diff -urN domoticz-4.10717.orig/hardware/plugins/DelayedLink.h domoticz-4.10717/hardware/plugins/DelayedLink.h --- domoticz-4.10717.orig/hardware/plugins/DelayedLink.h 2019-05-10 11:37:55.000000000 +0200 +++ domoticz-4.10717/hardware/plugins/DelayedLink.h 2019-10-05 19:05:40.930495976 +0200 @@ -145,18 +145,10 @@ if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll"); if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll"); # else - if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll"); # endif #else - if (!shared_lib_) FindLibrary("python3.8", true); - if (!shared_lib_) FindLibrary("python3.7", true); - if (!shared_lib_) FindLibrary("python3.6", true); - if (!shared_lib_) FindLibrary("python3.5", true); - if (!shared_lib_) FindLibrary("python3.4", true); + if (!shared_lib_) FindLibrary("python3", true); #endif if (shared_lib_) { @@ -271,24 +263,12 @@ library = "lib" + sLibrary + ".so"; shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); } - // look in directories covered by ldconfig but 'm' variant - if (!shared_lib_) - { - library = "lib" + sLibrary + "m.so"; - shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); - } // look in /usr/lib directories if (!shared_lib_) { library = "/usr/lib/" + sLibrary + "/"; FindLibrary(library, false); } - // look in /usr/lib directories but 'm' variant - if (!shared_lib_) - { - library = "/usr/lib/" + sLibrary + "m/"; - FindLibrary(library, false); - } // look in /usr/local/lib directory (handles build from source) if (!shared_lib_) { @@ -296,12 +276,6 @@ shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); } - // look in /usr/local/lib directory (handles build from source) but 'm' variant - if (!shared_lib_) - { - library = "/usr/local/lib/lib" + sLibrary + "m.so"; - shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); - } // MacOS // look for .dylib in /usr/local/lib if (!shared_lib_)