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

Restructure installation and package generation

Browse Source
This commit is contained in:
BtbN
2014-01-25 03:44:34 +01:00
parent e964bea518
commit 6a9dda87bd
8 changed files with 212 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/obs-cocoa.c
View File

@@ -25,7 +25,9 @@
// support both foo.so and libfoo.so for now
static const char *plugin_patterns[] = {
OBS_INSTALL_PREFIX "obs-plugins/%s.so",
OBS_INSTALL_PREFIX "obs-plugins/lib%s.so"
OBS_INSTALL_PREFIX "obs-plugins/lib%s.so",
"../../obs-plugins/64bit/%s.so",
"../../obs-plugins/64bit/lib%s.so"
};
static const int plugin_patterns_size =

52
libobs/obs-nix.c
View File

@@ -28,7 +28,7 @@ static inline bool check_path(const char* data, const char *path,
dstr_copy(output, path);
dstr_cat(output, data);
blog(LOG_INFO, "Attempting path: %s\n", output->array);
blog(LOG_INFO, "Attempting path: %s\n", output->array);
return access(output->array, R_OK) == 0;
}
@@ -39,8 +39,8 @@ static inline bool check_lib_path(const char* data, const char *path,
bool result = false;
struct dstr tmp;
dstr_init_copy(&tmp, "lib");
dstr_cat(&tmp, data);
dstr_init_copy(&tmp, "lib");
dstr_cat(&tmp, data);
dstr_cat(&tmp, ".so");
result = check_path(tmp.array, path, output);
@@ -58,12 +58,18 @@ char *find_plugin(const char *plugin)
struct dstr output;
dstr_init(&output);
if (check_lib_path(plugin, "obs-plugins/", &output))
return output.array;
if(sizeof(void*) == 4)
{
if (check_lib_path(plugin, "../../obs-plugins/32bit/", &output))
return output.array;
}
if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/",
&output))
return output.array;
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/",
&output))
return output.array;
}
dstr_free(&output);
return NULL;
@@ -81,9 +87,12 @@ char *find_libobs_data_file(const char *file)
if (check_path(file, OBS_DATA_PATH "/libobs/", &output))
return output.array;
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/",
&output))
return output.array;
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/",
&output))
return output.array;
}
dstr_free(&output);
return NULL;
@@ -95,16 +104,19 @@ char *find_libobs_data_file(const char *file)
*/
char *obs_find_plugin_file(const char *file)
{
struct dstr output;
dstr_init(&output);
struct dstr output;
dstr_init(&output);
if (check_path(file, OBS_DATA_PATH "/obs-plugins/", &output))
return output.array;
if (check_path(file, OBS_DATA_PATH "/obs-plugins/", &output))
return output.array;
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/",
&output))
return output.array;
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/",
&output))
return output.array;
}
dstr_free(&output);
return NULL;
dstr_free(&output);
return NULL;
}

10
libobs/obs-windows.c
View File

@@ -24,7 +24,11 @@
char *find_plugin(const char *plugin)
{
struct dstr path;
dstr_init_copy(&path, OBS_INSTALL_PREFIX "obs-plugins/");
#ifdef _WIN64
dstr_init_copy(&path, "../../obs-plugins/64bit/");
#else
dstr_init_copy(&path, "../../obs-plugins/32bit/");
#endif
dstr_cat(&path, plugin);
return path.array;
}
@@ -33,7 +37,7 @@ char *find_plugin(const char *plugin)
char *find_libobs_data_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/");
dstr_init_copy(&path, "../../data/libobs/");
dstr_cat(&path, file);
return path.array;
}
@@ -42,7 +46,7 @@ char *find_libobs_data_file(const char *file)
char *obs_find_plugin_file(const char *file)
{
struct dstr path;
dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/");
dstr_init_copy(&path, "../../data/obs-plugins/");
dstr_cat(&path, file);
return path.array;
}

2
libobs/util/c99defs.h
View File

@@ -69,7 +69,7 @@ typedef int64_t off64_t;
#endif /* _MSC_VER */
#ifndef OBS_DATA_PATH
#define OBS_DATA_PATH "data"
#define OBS_DATA_PATH "../../data"
#endif
#ifndef OBS_INSTALL_PREFIX