Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
4b4ddbb3
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,发现更多精彩内容 >>
提交
4b4ddbb3
编写于
10月 26, 2015
作者:
Y
yogpstop
提交者:
jp9000
2月 07, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
obs-outputs: Add USE_SSL option (disabled by default)
Closes jp9000/obs-studio#487
上级
77c538bd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
112 addition
and
2 deletion
+112
-2
cmake/Modules/CopyMSVCBins.cmake
cmake/Modules/CopyMSVCBins.cmake
+13
-0
cmake/Modules/FindSSL.cmake
cmake/Modules/FindSSL.cmake
+77
-0
plugins/obs-outputs/CMakeLists.txt
plugins/obs-outputs/CMakeLists.txt
+22
-0
plugins/obs-outputs/librtmp/rtmp.h
plugins/obs-outputs/librtmp/rtmp.h
+0
-2
未找到文件。
cmake/Modules/CopyMSVCBins.cmake
浏览文件 @
4b4ddbb3
...
...
@@ -22,6 +22,7 @@ endif()
find_package
(
Libavcodec QUIET
)
find_package
(
Libx264 QUIET
)
find_package
(
Libfdk QUIET
)
find_package
(
ssl QUIET
)
find_package
(
Qt5Core QUIET
)
file
(
GLOB FFMPEG_BIN_FILES
...
...
@@ -102,6 +103,16 @@ file(GLOB LIBFDK_BIN_FILES
"
${
Libfdk_INCLUDE_DIR
}
/bin/libfdk*-*.dll"
"
${
Libfdk_INCLUDE_DIR
}
/bin
${
_bin_suffix
}
/libfdk*-*.dll"
)
file
(
GLOB SSL_BIN_FILES
"
${
SSL_INCLUDE_DIR
}
/../bin
${
_bin_suffix
}
/ssleay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/../bin
${
_bin_suffix
}
/libeay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/../bin/ssleay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/../bin/libeay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/bin
${
_bin_suffix
}
/ssleay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/bin
${
_bin_suffix
}
/libeay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/bin/ssleay32*.dll"
"
${
SSL_INCLUDE_DIR
}
/bin/libeay32*.dll"
)
file
(
GLOB CURL_BIN_FILES
"
${
CURL_INCLUDE_DIR
}
/../build/Win
${
_bin_suffix
}
/VC12/DLL Release - DLL Windows SSPI/libcurl.dll"
"
${
CURL_INCLUDE_DIR
}
/../bin
${
_bin_suffix
}
/libcurl*.dll"
...
...
@@ -158,6 +169,7 @@ set(ALL_BASE_BIN_FILES
${
FFMPEG_BIN_FILES
}
${
X264_BIN_FILES
}
${
CURL_BIN_FILES
}
${
SSL_BIN_FILES
}
${
ZLIB_BIN_FILES
}
${
LIBFDK_BIN_FILES
}
${
FREETYPE_BIN_FILES
}
...
...
@@ -190,6 +202,7 @@ message(STATUS "x264 files: ${X264_BIN_FILES}")
message
(
STATUS
"Libfdk files:
${
LIBFDK_BIN_FILES
}
"
)
message
(
STATUS
"Freetype files:
${
FREETYPE_BIN_FILES
}
"
)
message
(
STATUS
"curl files:
${
CURL_BIN_FILES
}
"
)
message
(
STATUS
"ssl files:
${
SSL_BIN_FILES
}
"
)
message
(
STATUS
"zlib files:
${
ZLIB_BIN_FILES
}
"
)
message
(
STATUS
"QT Debug files:
${
QT_DEBUG_BIN_FILES
}
"
)
message
(
STATUS
"QT Debug Platform files:
${
QT_DEBUG_PLAT_BIN_FILES
}
"
)
...
...
cmake/Modules/FindSSL.cmake
0 → 100644
浏览文件 @
4b4ddbb3
# Once done these will be defined:
#
# SSL_FOUND
# SSL_INCLUDE_DIRS
# SSL_LIBRARIES
#
# For use in OBS:
#
# SSL_INCLUDE_DIR
find_package
(
PkgConfig QUIET
)
if
(
PKG_CONFIG_FOUND
)
pkg_check_modules
(
_CRYPTO QUIET libcrypto
)
pkg_check_modules
(
_SSL QUIET libssl
)
endif
()
if
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
set
(
_lib_suffix 64
)
else
()
set
(
_lib_suffix 32
)
endif
()
set
(
_SSL_BASE_HINTS
ENV sslPath
${
_lib_suffix
}
ENV sslPath
ENV DepsPath
${
_lib_suffix
}
ENV DepsPath
${
sslPath
${
_lib_suffix
}}
${
sslPath
}
${
DepsPath
${
_lib_suffix
}}
${
DepsPath
}
)
set
(
_SSL_LIB_SUFFIXES
lib
${
_lib_suffix
}
lib
libs
${
_lib_suffix
}
libs
bin
${
_lib_suffix
}
bin
../lib
${
_lib_suffix
}
../lib
../libs
${
_lib_suffix
}
../libs
../bin
${
_lib_suffix
}
../bin
)
find_path
(
SSL_INCLUDE_DIR
NAMES openssl/ssl.h
HINTS
${
_SSL_BASE_HINTS
}
${
_CRYPTO_INCLUDE_DIRS
}
${
_SSL_INCLUDE_DIRS
}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES
include
)
find_library
(
_SSL_LIB
NAMES
${
_SSL_LIBRARIES
}
ssleay32 ssl
HINTS
${
_SSL_BASE_HINTS
}
${
_SSL_LIBRARY_DIRS
}
PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
PATH_SUFFIXES
${
_SSL_LIB_SUFFIXES
}
)
find_library
(
_CRYPTO_LIB
NAMES
${
_CRYPTO_LIBRARIES
}
libeay32 crypto
HINTS
${
_SSL_BASE_HINTS
}
${
_CRYPTO_LIBRARY_DIRS
}
PATHS
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
PATH_SUFFIXES
${
_SSL_LIB_SUFFIXES
}
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
ssl DEFAULT_MSG _SSL_LIB _CRYPTO_LIB SSL_INCLUDE_DIR
)
mark_as_advanced
(
SSL_INCLUDE_DIR _SSL_LIB _CRYPTO_LIB
)
if
(
SSL_FOUND
)
set
(
SSL_INCLUDE_DIRS
${
SSL_INCLUDE_DIR
}
)
set
(
SSL_LIBRARIES
${
_SSL_LIB
}
${
_CRYPTO_LIB
}
)
endif
()
plugins/obs-outputs/CMakeLists.txt
浏览文件 @
4b4ddbb3
project
(
obs-outputs
)
option
(
USE_SSL
"Enable rtmps support with OpenSSL"
OFF
)
if
(
USE_SSL
)
find_package
(
SSL QUIET
)
find_package
(
ZLIB QUIET
)
endif
()
if
(
SSL_FOUND AND ZLIB_FOUND
)
add_definitions
(
-DCRYPTO -DUSE_OPENSSL
)
include_directories
(
${
SSL_INCLUDE_DIRS
}
${
ZLIB_INCLUDE_DIRS
}
)
else
()
if
(
USE_SSL
)
message
(
WARNING
"SSL enabled by user, but OpenSSL was not found"
)
endif
()
unset
(
SSL_LIBRARIES
)
unset
(
ZLIB_LIBRARIES
)
add_definitions
(
-DNO_CRYPTO
)
endif
()
if
(
WIN32
)
set
(
obs-outputs_PLATFORM_DEPS
ws2_32
...
...
@@ -58,6 +78,8 @@ add_library(obs-outputs MODULE
${
obs-outputs_librtmp_HEADERS
}
)
target_link_libraries
(
obs-outputs
libobs
${
SSL_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
obs-outputs_PLATFORM_DEPS
}
)
install_obs_plugin_with_data
(
obs-outputs data
)
plugins/obs-outputs/librtmp/rtmp.h
浏览文件 @
4b4ddbb3
...
...
@@ -25,8 +25,6 @@
* http://www.gnu.org/copyleft/lgpl.html
*/
#define NO_CRYPTO 1
#if !defined(NO_CRYPTO) && !defined(CRYPTO)
#define CRYPTO
#else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录