opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some formatting issues and fix cmake file

Browse Source
This commit is contained in:
jp9000
2014-01-25 12:34:37 -07:00
parent 584e47e467
commit 93d15ef254
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-cocoa.c
+2 -2
View File
@@ -49,7 +49,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, OBS_INSTALL_DATA_PATH "/libobs/");
dstr_cat(&path, file);
return path.array;
}
@@ -57,7 +57,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, OBS_INSTALL_DATA_PATH "/obs-plugins/");
dstr_cat(&path, file);
return path.array;
}
libobs/obs-nix.c
+5 -4
View File
@@ -66,7 +66,8 @@ char *find_plugin(const char *plugin)
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/",
if (check_lib_path(plugin,
OBS_INSTALL_PREFIX "lib/obs-plugins/",
&output))
return output.array;
}
@@ -89,7 +90,7 @@ char *find_libobs_data_file(const char *file)
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/",
if (check_path(file, OBS_INSTALL_DATA_PATH "/libobs/",
&output))
return output.array;
}
@@ -112,8 +113,8 @@ char *obs_find_plugin_file(const char *file)
if (OBS_INSTALL_PREFIX [0] != 0)
{
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/",
&output))
if (check_path(file, OBS_INSTALL_DATA_PATH "/obs-plugins/",
&output))
return output.array;
}
libobs/util/c99defs.h
+2
View File
@@ -75,3 +75,5 @@ typedef int64_t off64_t;
#ifndef OBS_INSTALL_PREFIX
#define OBS_INSTALL_PREFIX ""
#endif
#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH