Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
93d15ef2
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
93d15ef2
编写于
1月 25, 2014
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some formatting issues and fix cmake file
上级
584e47e4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
8 deletion
+11
-8
cmake/Modules/ObsHelpers.cmake
cmake/Modules/ObsHelpers.cmake
+2
-2
libobs/obs-cocoa.c
libobs/obs-cocoa.c
+2
-2
libobs/obs-nix.c
libobs/obs-nix.c
+5
-4
libobs/util/c99defs.h
libobs/util/c99defs.h
+2
-0
未找到文件。
cmake/Modules/ObsHelpers.cmake
浏览文件 @
93d15ef2
...
@@ -24,8 +24,8 @@ if(NOT UNIX_STRUCTURE)
...
@@ -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"
)
...
...
libobs/obs-cocoa.c
浏览文件 @
93d15ef2
...
@@ -49,7 +49,7 @@ char *find_plugin(const char *plugin)
...
@@ -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)
...
@@ -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
;
}
}
libobs/obs-nix.c
浏览文件 @
93d15ef2
...
@@ -66,7 +66,8 @@ char *find_plugin(const char *plugin)
...
@@ -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)
...
@@ -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)
...
@@ -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
;
}
}
...
...
libobs/util/c99defs.h
浏览文件 @
93d15ef2
...
@@ -75,3 +75,5 @@ typedef int64_t off64_t;
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录