Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
98478b68
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,发现更多精彩内容 >>
提交
98478b68
编写于
4月 20, 2014
作者:
J
Jim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #68 from BtbN/fixes
Some bundled dependency cmake related fixes
上级
2faef6f0
b586240f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
33 deletion
+18
-33
deps/CMakeLists.txt
deps/CMakeLists.txt
+0
-5
deps/jansson/CMakeLists.txt
deps/jansson/CMakeLists.txt
+10
-23
deps/w32-pthreads/CMakeLists.txt
deps/w32-pthreads/CMakeLists.txt
+4
-3
deps/w32-pthreads/pthread_win32_attach_detach_np.c
deps/w32-pthreads/pthread_win32_attach_detach_np.c
+4
-2
未找到文件。
deps/CMakeLists.txt
浏览文件 @
98478b68
...
...
@@ -4,9 +4,4 @@ if(WIN32)
endif
()
add_subdirectory
(
glad
)
set
(
BUILD_DOCS FALSE CACHE INTERNAL
""
FORCE
)
set
(
STATIC_CRT TRUE CACHE INTERNAL
""
FORCE
)
set
(
BUILD_SHARED_LIBS TRUE CACHE INTERNAL
""
FORCE
)
set
(
WITHOUT_TESTS TRUE CACHE INTERNAL
""
FORCE
)
add_subdirectory
(
jansson
)
deps/jansson/CMakeLists.txt
浏览文件 @
98478b68
...
...
@@ -50,15 +50,6 @@ cmake_minimum_required (VERSION 2.8)
# required for exports? cmake_minimum_required (VERSION 2.8.6)
project
(
jansson C
)
# Options
OPTION
(
BUILD_SHARED_LIBS
"Build shared libraries."
OFF
)
if
(
MSVC
)
# This option must match the settings used in your program, in particular if you
# are linking statically
OPTION
(
STATIC_CRT
"Link the static CRT libraries"
OFF
)
endif
()
# Set some nicer output dirs.
SET
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/bin
)
SET
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/lib
)
...
...
@@ -95,7 +86,8 @@ if (MSVC)
# Turn off Microsofts "security" warnings.
add_definitions
(
"/W3 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo"
)
if
(
STATIC_CRT
)
# Disabled by OBS, options already set by top level CMakeLists
if
(
FALSE
)
set
(
CMAKE_C_FLAGS_RELEASE
"/MT"
)
set
(
CMAKE_C_FLAGS_DEBUG
"/MTd"
)
endif
()
...
...
@@ -273,7 +265,8 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/private_include)
# Add the lib sources.
file
(
GLOB C_FILES src/*.c
)
if
(
BUILD_SHARED_LIBS
)
# Disabled by OBS, we use it as a static library
if
(
FALSE
)
add_library
(
jansson SHARED
${
C_FILES
}
src/jansson.def
)
...
...
@@ -305,8 +298,9 @@ endif ()
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
# For building Documentation (uses Sphinx)
OPTION
(
BUILD_DOCS
"Build documentation (uses python-sphinx)."
ON
)
if
(
BUILD_DOCS
)
# OPTION (BUILD_DOCS "Build documentation (uses python-sphinx)." ON)
# Disabled by OBS
if
(
FALSE
)
find_package
(
Sphinx
)
if
(
NOT SPHINX_FOUND
)
...
...
@@ -390,10 +384,8 @@ if (BUILD_DOCS)
endif
()
endif
()
OPTION
(
WITHOUT_TESTS
"Don't build tests ('make test' to execute tests)"
OFF
)
if
(
NOT WITHOUT_TESTS
)
# Disabled by OBS, we don't test this.
if
(
FALSE
)
OPTION
(
TEST_WITH_VALGRIND
"Enable valgrind tests."
OFF
)
ENABLE_TESTING
()
...
...
@@ -479,10 +471,5 @@ if (NOT WITHOUT_TESTS)
DEPENDS json_process
${
api_tests
}
)
endif
()
file
(
COPY
${
CMAKE_CURRENT_BINARY_DIR
}
/include/jansson_config.h
DESTINATION
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/
)
target_include_directories
(
jansson
PUBLIC src
)
install_obs_core
(
jansson
)
PUBLIC src
"
${
CMAKE_CURRENT_BINARY_DIR
}
/include"
)
deps/w32-pthreads/CMakeLists.txt
浏览文件 @
98478b68
project
(
w32-pthreads
)
add_definitions
(
-D__CLEANUP_C
)
add_definitions
(
-DPTW32_BUILD
)
set
(
w32-pthreads_SOURCES
pthread.c
)
...
...
@@ -15,6 +12,10 @@ set(w32-pthreads_HEADERS
add_library
(
w32-pthreads SHARED
${
w32-pthreads_SOURCES
}
${
w32-pthreads_HEADERS
}
)
target_compile_definitions
(
w32-pthreads
PRIVATE __CLEANUP_C PTW32_BUILD
)
target_include_directories
(
w32-pthreads
PUBLIC .
)
target_link_libraries
(
w32-pthreads
)
install_obs_core
(
w32-pthreads
)
deps/w32-pthreads/pthread_win32_attach_detach_np.c
浏览文件 @
98478b68
...
...
@@ -37,6 +37,8 @@
#include "pthread.h"
#include "implement.h"
#include <tchar.h>
/*
* Handle to quserex.dll
*/
...
...
@@ -80,8 +82,8 @@ pthread_win32_process_attach_np ()
}
#else
/* strncat is secure - this is just to avoid a warning */
if
(
GetSystemDirectory
(
QuserExDLLPathBuf
,
sizeof
(
QuserExDLLPathBuf
))
&&
0
==
strncat_s
(
QuserExDLLPathBuf
,
sizeof
(
QuserExDLLPathBuf
),
"
\\
QUSEREX.DLL"
,
12
))
if
(
GetSystemDirectory
(
QuserExDLLPathBuf
,
sizeof
(
QuserExDLLPathBuf
)
/
sizeof
(
TCHAR
)
)
&&
0
==
_tcsncat_s
(
QuserExDLLPathBuf
,
sizeof
(
QuserExDLLPathBuf
)
/
sizeof
(
TCHAR
),
TEXT
(
"
\\
QUSEREX.DLL"
)
,
12
))
{
ptw32_h_quserex
=
LoadLibrary
(
QuserExDLLPathBuf
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录