jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Search for plugins without lib prefix

Browse Source 
Fixes #213
This commit is contained in:
BtbN 2014-07-19 10:25:55 +02:00
parent c5c8cba74d
commit 1098c75d34
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libobs/obs-nix.c
View File

@ -41,7 +41,7 @@ static inline bool check_lib_path(const char* data, const char *path,
bool result = false;
struct dstr tmp;
dstr_init_copy(&tmp, "lib");
dstr_init(&tmp);
dstr_cat(&tmp, data);
dstr_cat(&tmp, ".so");
result = check_path(tmp.array, path, output);
@ -63,9 +63,15 @@ char *find_plugin(const char *plugin)
if(sizeof(void*) == 4) {
if (check_lib_path(plugin, "../../obs-plugins/32bit/", &output))
return output.array;
if (check_lib_path(plugin, "../../obs-plugins/32bit/lib", &output))
return output.array;
} else {
if (check_lib_path(plugin, "../../obs-plugins/64bit/", &output))
return output.array;
if (check_lib_path(plugin, "../../obs-plugins/64bit/lib", &output))
return output.array;
}
if (OBS_INSTALL_PREFIX [0] != 0) {
@ -73,6 +79,11 @@ char *find_plugin(const char *plugin)
OBS_INSTALL_PREFIX "lib/obs-plugins/",
&output))
return output.array;
if (check_lib_path(plugin,
OBS_INSTALL_PREFIX "lib/obs-plugins/lib",
&output))
return output.array;
}
dstr_free(&output);