Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
d9408b51
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,发现更多精彩内容 >>
未验证
提交
d9408b51
编写于
8月 22, 2020
作者:
J
Jim
提交者:
GitHub
8月 22, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3288 from makise-homura/e2k_support
E2k support
上级
fbb419f4
543a3767
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
4 deletion
+29
-4
CMakeLists.txt
CMakeLists.txt
+28
-3
plugins/obs-x264/obs-x264-options.c
plugins/obs-x264/obs-x264-options.c
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
d9408b51
...
@@ -62,6 +62,8 @@ set(SCRIPTING_ENABLED OFF CACHE BOOL "Internal global cmake variable" FORCE)
...
@@ -62,6 +62,8 @@ set(SCRIPTING_ENABLED OFF CACHE BOOL "Internal global cmake variable" FORCE)
include
(
ObsHelpers
)
include
(
ObsHelpers
)
include
(
ObsCpack
)
include
(
ObsCpack
)
include
(
GNUInstallDirs
)
include
(
GNUInstallDirs
)
include
(
CheckCCompilerFlag
)
include
(
CheckCXXCompilerFlag
)
# Must be a string in the format of "x.x.x-rcx"
# Must be a string in the format of "x.x.x-rcx"
if
(
DEFINED RELEASE_CANDIDATE
)
if
(
DEFINED RELEASE_CANDIDATE
)
...
@@ -120,7 +122,7 @@ else ()
...
@@ -120,7 +122,7 @@ else ()
string
(
TOLOWER
${
CMAKE_SYSTEM_PROCESSOR
}
LOWERCASE_CMAKE_SYSTEM_PROCESSOR
)
string
(
TOLOWER
${
CMAKE_SYSTEM_PROCESSOR
}
LOWERCASE_CMAKE_SYSTEM_PROCESSOR
)
endif
()
endif
()
if
(
LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES
"(i[3-6]86|x86|x64|x86_64|amd64)"
)
if
(
LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES
"(i[3-6]86|x86|x64|x86_64|amd64
|e2k
)"
)
set
(
NEEDS_SIMDE
"0"
)
set
(
NEEDS_SIMDE
"0"
)
if
(
NOT MSVC
)
if
(
NOT MSVC
)
set
(
ARCH_SIMD_FLAGS
"-mmmx"
"-msse"
"-msse2"
)
set
(
ARCH_SIMD_FLAGS
"-mmmx"
"-msse"
"-msse2"
)
...
@@ -133,8 +135,16 @@ else()
...
@@ -133,8 +135,16 @@ else()
set
(
NEEDS_SIMDE
"1"
)
set
(
NEEDS_SIMDE
"1"
)
add_definitions
(
-DNEEDS_SIMDE=1
)
add_definitions
(
-DNEEDS_SIMDE=1
)
if
(
CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX
)
if
(
CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp-simd -DSIMDE_ENABLE_OPENMP"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DSIMDE_ENABLE_OPENMP"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fopenmp-simd -DSIMDE_ENABLE_OPENMP"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DSIMDE_ENABLE_OPENMP"
)
CHECK_C_COMPILER_FLAG
(
"-fopenmp-simd"
C_COMPILER_SUPPORTS_OPENMP_SIMD
)
if
(
C_COMPILER_SUPPORTS_OPENMP_SIMD
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fopenmp-simd"
)
endif
()
CHECK_CXX_COMPILER_FLAG
(
"-fopenmp-simd"
CXX_COMPILER_SUPPORTS_OPENMP_SIMD
)
if
(
CXX_COMPILER_SUPPORTS_OPENMP_SIMD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp-simd"
)
endif
()
endif
()
endif
()
set
(
ARCH_SIMD_FLAGS
""
)
set
(
ARCH_SIMD_FLAGS
""
)
message
(
STATUS
"No Native SSE2 SIMD Support - Using SIMDE"
)
message
(
STATUS
"No Native SSE2 SIMD Support - Using SIMDE"
)
...
@@ -204,6 +214,21 @@ elseif(UNIX)
...
@@ -204,6 +214,21 @@ elseif(UNIX)
endif
()
endif
()
endif
()
endif
()
if
(
LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES
"e2k"
)
foreach
(
TEST_C_FLAG
"-Wno-unused-parameter"
"-Wno-ignored-qualifiers"
"-Wno-pointer-sign"
"-Wno-unused-variable"
"-Wno-sign-compare"
"-Wno-bad-return-value-type"
"-Wno-maybe-uninitialized"
)
CHECK_C_COMPILER_FLAG
(
${
TEST_C_FLAG
}
C_COMPILER_SUPPORTS_FLAG_
${
TEST_C_FLAG
}
)
if
(
C_COMPILER_SUPPORTS_FLAG_
${
TEST_C_FLAG
}
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
TEST_C_FLAG
}
"
)
endif
()
endforeach
()
foreach
(
TEST_CXX_FLAG
"-Wno-invalid-offsetof"
"-Wno-maybe-uninitialized"
)
CHECK_CXX_COMPILER_FLAG
(
${
TEST_CXX_FLAG
}
CXX_COMPILER_SUPPORTS_FLAG_
${
TEST_CXX_FLAG
}
)
if
(
CXX_COMPILER_SUPPORTS_FLAG_
${
TEST_CXX_FLAG
}
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
TEST_CXX_FLAG
}
"
)
endif
()
endforeach
()
endif
()
option
(
BUILD_TESTS
"Build test directory (includes test sources and possibly a platform test executable)"
FALSE
)
option
(
BUILD_TESTS
"Build test directory (includes test sources and possibly a platform test executable)"
FALSE
)
mark_as_advanced
(
BUILD_TESTS
)
mark_as_advanced
(
BUILD_TESTS
)
...
...
plugins/obs-x264/obs-x264-options.c
浏览文件 @
d9408b51
...
@@ -45,7 +45,7 @@ struct obs_x264_options obs_x264_parse_options(const char *options_string)
...
@@ -45,7 +45,7 @@ struct obs_x264_options obs_x264_parse_options(const char *options_string)
struct
obs_x264_option
*
out_option
=
out_options
;
struct
obs_x264_option
*
out_option
=
out_options
;
for
(
char
**
input_word
=
input_words
;
*
input_word
;
++
input_word
)
{
for
(
char
**
input_word
=
input_words
;
*
input_word
;
++
input_word
)
{
if
(
getparam
(
*
input_word
,
&
out_option
->
name
,
if
(
getparam
(
*
input_word
,
&
out_option
->
name
,
&
out_option
->
value
))
{
(
const
char
**
)
&
out_option
->
value
))
{
++
out_option
;
++
out_option
;
}
else
{
}
else
{
*
ignored_word
=
*
input_word
;
*
ignored_word
=
*
input_word
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录