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

Fix some formatting issues and fix cmake file

master
jp9000 2014-01-25 12:34:37 -07:00
parent 584e47e467
commit 93d15ef254
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/ObsHelpers.cmake
View File

@ -24,8 +24,8 @@ if(NOT UNIX_STRUCTURE)
set(OBS_EXECUTABLE32_DESTINATION "bin/32bit") set(OBS_EXECUTABLE32_DESTINATION "bin/32bit")
set(OBS_EXECUTABLE64_DESTINATION "bin/64bit") set(OBS_EXECUTABLE64_DESTINATION "bin/64bit")
set(OBS_LIBRARY_DESTINATION "bin/${_lib_suffix}bit") set(OBS_LIBRARY_DESTINATION "bin/${_lib_suffix}bit")
set(OBS_LIBRARY32_DESTINATION "lib32") set(OBS_LIBRARY32_DESTINATION "bin/32bit")
set(OBS_LIBRARY64_DESTINATION "lib64") set(OBS_LIBRARY64_DESTINATION "bin/64bit")
set(OBS_PLUGIN_DESTINATION "obs-plugins/${_lib_suffix}bit") set(OBS_PLUGIN_DESTINATION "obs-plugins/${_lib_suffix}bit")
set(OBS_PLUGIN32_DESTINATION "obs-plugins/32bit") set(OBS_PLUGIN32_DESTINATION "obs-plugins/32bit")
set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit") set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit")

4
libobs/obs-cocoa.c
View File

@ -49,7 +49,7 @@ char *find_plugin(const char *plugin)
char *find_libobs_data_file(const char *file) char *find_libobs_data_file(const char *file)
{ {
struct dstr path; 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); dstr_cat(&path, file);
return path.array; return path.array;
} }
@ -57,7 +57,7 @@ char *find_libobs_data_file(const char *file)
char *obs_find_plugin_file(const char *file) char *obs_find_plugin_file(const char *file)
{ {
struct dstr path; 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); dstr_cat(&path, file);
return path.array; return path.array;
} }

9
libobs/obs-nix.c
View File

@ -66,7 +66,8 @@ char *find_plugin(const char *plugin)
if (OBS_INSTALL_PREFIX [0] != 0) 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)) &output))
return output.array; return output.array;
} }
@ -89,7 +90,7 @@ char *find_libobs_data_file(const char *file)
if (OBS_INSTALL_PREFIX [0] != 0) 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)) &output))
return output.array; return output.array;
} }
@ -112,8 +113,8 @@ char *obs_find_plugin_file(const char *file)
if (OBS_INSTALL_PREFIX [0] != 0) if (OBS_INSTALL_PREFIX [0] != 0)
{ {
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/", if (check_path(file, OBS_INSTALL_DATA_PATH "/obs-plugins/",
&output)) &output))
return output.array; return output.array;
} }

2
libobs/util/c99defs.h
View File

@ -75,3 +75,5 @@ typedef int64_t off64_t;
#ifndef OBS_INSTALL_PREFIX #ifndef OBS_INSTALL_PREFIX
#define OBS_INSTALL_PREFIX "" #define OBS_INSTALL_PREFIX ""
#endif #endif
#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH