Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
b88ea35c
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,发现更多精彩内容 >>
未验证
提交
b88ea35c
编写于
1月 27, 2020
作者:
J
Jim
提交者:
GitHub
1月 27, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2341 from FlyGoat/cross-plat
Add support for MIPS architecture
上级
44dc06ed
af062863
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
39 addition
and
43 deletion
+39
-43
CMakeLists.txt
CMakeLists.txt
+19
-1
deps/media-playback/CMakeLists.txt
deps/media-playback/CMakeLists.txt
+4
-15
libobs/CMakeLists.txt
libobs/CMakeLists.txt
+12
-24
libobs/obsconfig.h.in
libobs/obsconfig.h.in
+1
-0
libobs/util/simde/check.h
libobs/util/simde/check.h
+0
-0
libobs/util/simde/hedley.h
libobs/util/simde/hedley.h
+0
-0
libobs/util/simde/mmx.h
libobs/util/simde/mmx.h
+0
-0
libobs/util/simde/simde-arch.h
libobs/util/simde/simde-arch.h
+0
-0
libobs/util/simde/simde-common.h
libobs/util/simde/simde-common.h
+0
-0
libobs/util/simde/sse.h
libobs/util/simde/sse.h
+0
-0
libobs/util/simde/sse2.h
libobs/util/simde/sse2.h
+0
-0
libobs/util/sse-intrin.h
libobs/util/sse-intrin.h
+2
-2
plugins/linux-v4l2/v4l2-controls.c
plugins/linux-v4l2/v4l2-controls.c
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
b88ea35c
...
@@ -78,8 +78,26 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "C
...
@@ -78,8 +78,26 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "C
set
(
CMAKE_COMPILER_IS_CLANG TRUE
)
set
(
CMAKE_COMPILER_IS_CLANG TRUE
)
endif
()
endif
()
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"^(powerpc|ppc)64(le)?"
)
if
(
MSVC_CXX_ARCHITECTURE_ID
)
string
(
TOLOWER
${
MSVC_CXX_ARCHITECTURE_ID
}
LOWERCASE_CMAKE_SYSTEM_PROCESSOR
)
else
()
string
(
TOLOWER
${
CMAKE_SYSTEM_PROCESSOR
}
LOWERCASE_CMAKE_SYSTEM_PROCESSOR
)
endif
()
if
(
LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES
"(i[3-6]86|x86|x64|x86_64|amd64)"
)
set
(
NEEDS_SIMDE
"0"
)
if
(
NOT MSVC
)
set
(
ARCH_SIMD_FLAGS
"-mmmx"
"-msse"
"-msse2"
)
endif
()
elseif
(
LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES
"^(powerpc|ppc)64(le)?"
)
set
(
NEEDS_SIMDE
"0"
)
set
(
ARCH_SIMD_FLAGS
"-mvsx"
)
add_compile_definitions
(
NO_WARN_X86_INTRINSICS
)
add_compile_definitions
(
NO_WARN_X86_INTRINSICS
)
else
()
set
(
NEEDS_SIMDE
"1"
)
add_definitions
(
-DNEEDS_SIMDE=1
)
set
(
ARCH_SIMD_FLAGS
""
)
message
(
STATUS
"No Native SSE2 SIMD Support - Using SIMDE"
)
endif
()
endif
()
if
(
CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG
)
if
(
CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG
)
...
...
deps/media-playback/CMakeLists.txt
浏览文件 @
b88ea35c
...
@@ -23,26 +23,15 @@ add_library(media-playback STATIC
...
@@ -23,26 +23,15 @@ add_library(media-playback STATIC
${
media-playback_SOURCES
}
${
media-playback_SOURCES
}
)
)
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"^(powerpc|ppc)64(le)?"
)
target_compile_options
(
media-playback
target_compile_options
(
media-playback
PUBLIC
PUBLIC
${
ARCH_SIMD_FLAGS
}
)
-mvsx
)
add_compile_definitions
(
NO_WARN_X86_INTRINSICS
)
elseif
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"aarch64"
)
target_compile_options
(
media-playback
PUBLIC
)
elseif
(
NOT MSVC
)
target_compile_options
(
media-playback
PUBLIC
-mmmx
-msse
-msse2
)
endif
()
target_include_directories
(
media-playback
target_include_directories
(
media-playback
PUBLIC .
PUBLIC .
)
)
if
(
NOT MSVC
)
if
(
NOT MSVC
)
if
(
NOT MINGW
)
if
(
NOT MINGW
)
target_compile_options
(
media-playback PRIVATE -fPIC
)
target_compile_options
(
media-playback PRIVATE -fPIC
)
...
...
libobs/CMakeLists.txt
浏览文件 @
b88ea35c
...
@@ -174,20 +174,21 @@ elseif(UNIX)
...
@@ -174,20 +174,21 @@ elseif(UNIX)
util/pipe-posix.c
util/pipe-posix.c
util/platform-nix.c
)
util/platform-nix.c
)
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"aarch64"
)
if
(
NEEDS_SIMDE
)
set
(
libobs_PLATFORM_HEADERS
set
(
libobs_PLATFORM_HEADERS
util/
aarch
/check.h
util/
simde
/check.h
util/
aarch
/hedley.h
util/
simde
/hedley.h
util/
aarch
/mmx.h
util/
simde
/mmx.h
util/
aarch
/simde-arch.h
util/
simde
/simde-arch.h
util/
aarch
/simde-common.h
util/
simde
/simde-common.h
util/
aarch
/sse.h
util/
simde
/sse.h
util/
aarch
/sse2.h
util/
simde
/sse2.h
util/threading-posix.h
)
util/threading-posix.h
)
else
()
else
()
set
(
libobs_PLATFORM_HEADERS
set
(
libobs_PLATFORM_HEADERS
util/threading-posix.h
)
util/threading-posix.h
)
endif
()
endif
()
if
(
HAVE_PULSEAUDIO
)
if
(
HAVE_PULSEAUDIO
)
set
(
libobs_audio_monitoring_HEADERS
set
(
libobs_audio_monitoring_HEADERS
audio-monitoring/pulse/pulseaudio-wrapper.h
)
audio-monitoring/pulse/pulseaudio-wrapper.h
)
...
@@ -475,22 +476,9 @@ target_compile_definitions(libobs
...
@@ -475,22 +476,9 @@ target_compile_definitions(libobs
PUBLIC
PUBLIC
HAVE_OBSCONFIG_H
)
HAVE_OBSCONFIG_H
)
if
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"^(powerpc|ppc)64(le)?"
)
target_compile_options
(
libobs
target_compile_options
(
libobs
PUBLIC
PUBLIC
${
ARCH_SIMD_FLAGS
}
)
-mvsx
)
add_compile_definitions
(
NO_WARN_X86_INTRINSICS
)
elseif
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"aarch64"
)
target_compile_options
(
libobs
PUBLIC
)
elseif
(
NOT MSVC
)
target_compile_options
(
libobs
PUBLIC
-mmmx
-msse
-msse2
)
endif
()
target_compile_options
(
libobs
target_compile_options
(
libobs
PUBLIC
PUBLIC
...
...
libobs/obsconfig.h.in
浏览文件 @
b88ea35c
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#define HAVE_DBUS @HAVE_DBUS@
#define HAVE_DBUS @HAVE_DBUS@
#define HAVE_PULSEAUDIO @HAVE_PULSEAUDIO@
#define HAVE_PULSEAUDIO @HAVE_PULSEAUDIO@
#define USE_XINPUT @USE_XINPUT@
#define USE_XINPUT @USE_XINPUT@
#define NEEDS_SIMDE @NEEDS_SIMDE@
#define LIBOBS_IMAGEMAGICK_DIR_STYLE_6L 6
#define LIBOBS_IMAGEMAGICK_DIR_STYLE_6L 6
#define LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE 7
#define LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE 7
#define LIBOBS_IMAGEMAGICK_DIR_STYLE @LIBOBS_IMAGEMAGICK_DIR_STYLE@
#define LIBOBS_IMAGEMAGICK_DIR_STYLE @LIBOBS_IMAGEMAGICK_DIR_STYLE@
...
...
libobs/util/
aarch
/check.h
→
libobs/util/
simde
/check.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/hedley.h
→
libobs/util/
simde
/hedley.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/mmx.h
→
libobs/util/
simde
/mmx.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/simde-arch.h
→
libobs/util/
simde
/simde-arch.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/simde-common.h
→
libobs/util/
simde
/simde-common.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/sse.h
→
libobs/util/
simde
/sse.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/
aarch
/sse2.h
→
libobs/util/
simde
/sse2.h
浏览文件 @
b88ea35c
文件已移动
libobs/util/sse-intrin.h
浏览文件 @
b88ea35c
...
@@ -17,9 +17,9 @@
...
@@ -17,9 +17,9 @@
#pragma once
#pragma once
#if
def __aarch64__
#if
NEEDS_SIMDE
#include "
aarch
/sse2.h"
#include "
simde
/sse2.h"
#define __m128 simde__m128
#define __m128 simde__m128
#define _mm_setzero_ps simde_mm_setzero_ps
#define _mm_setzero_ps simde_mm_setzero_ps
...
...
plugins/linux-v4l2/v4l2-controls.c
浏览文件 @
b88ea35c
...
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
...
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if defined(__i386__)
#if defined(__i386__)
#define UINT_TO_POINTER(val) ((void *)(unsigned int)(val))
#define UINT_TO_POINTER(val) ((void *)(unsigned int)(val))
#define POINTER_TO_UINT(p) ((unsigned int)(unsigned int)(p))
#define POINTER_TO_UINT(p) ((unsigned int)(unsigned int)(p))
#elif defined(__x86_64__)
#elif defined(__x86_64__)
|| defined(__aarch64__) || (_MIPS_SIM == _ABI64)
#define UINT_TO_POINTER(val) ((void *)(unsigned long)(val))
#define UINT_TO_POINTER(val) ((void *)(unsigned long)(val))
#define POINTER_TO_UINT(p) ((unsigned int)(unsigned long)(p))
#define POINTER_TO_UINT(p) ((unsigned int)(unsigned long)(p))
#else
#else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录