Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
e230b0e9
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,发现更多精彩内容 >>
提交
e230b0e9
编写于
11月 29, 2013
作者:
P
Palana
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated include paths (CMake+osxtest) and function prototype (osxtest)
fixes compilation with changes from
e5c99175
上级
99b06288
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
8 deletion
+10
-8
libobs-opengl/CMakeLists.txt
libobs-opengl/CMakeLists.txt
+2
-2
obs/CMakeLists.txt
obs/CMakeLists.txt
+3
-1
test/osx/CMakeLists.txt
test/osx/CMakeLists.txt
+1
-1
test/osx/test.mm
test/osx/test.mm
+3
-3
test/test-input/CMakeLists.txt
test/test-input/CMakeLists.txt
+1
-1
未找到文件。
libobs-opengl/CMakeLists.txt
浏览文件 @
e230b0e9
...
...
@@ -14,7 +14,7 @@ endif()
option
(
USE_STATIC_GLEW
"Build using bundled GLEW"
${
WIN32
}
)
include_directories
(
${
obs_SOURCE_DIR
}
/libobs
)
include_directories
(
SYSTEM
${
obs_SOURCE_DIR
}
/libobs
)
find_package
(
OpenGL REQUIRED
)
include_directories
(
${
OPENGL_INCLUDE_DIRS
}
)
...
...
@@ -26,7 +26,7 @@ if(NOT USE_STATIC_GLEW)
include_directories
(
${
GLEW_INCLUDE_DIRS
}
)
set
(
GLEW_SRC
)
else
()
include_directories
(
glew/include
)
include_directories
(
SYSTEM
glew/include
)
add_definitions
(
-DGLEW_STATIC
)
set
(
GLEW_SRC glew/src/glew.c
)
endif
()
...
...
obs/CMakeLists.txt
浏览文件 @
e230b0e9
...
...
@@ -10,6 +10,7 @@ function(wx_required_version)
endforeach
()
set
(
CMAKE_REQUIRED_DEFINITIONS
${
WX_CHECK_DEFINITIONS
}
)
set
(
CMAKE_REQUIRED_INCLUDES
${
wxWidgets_INCLUDE_DIRS
}
)
set
(
CMAKE_REQUIRED_FLAGS
${
wxWidgets_CXX_FLAGS
}
)
check_cxx_source_compiles
(
"
#include <wx/sysopt.h>
#if (wxMINOR_VERSION < 9 && wxMAJOR_VERSION <= 2) || wxMAJOR_VERSION < 3
...
...
@@ -24,8 +25,9 @@ function(wx_required_version)
endfunction
()
wx_required_version
()
include_directories
(
SYSTEM
${
obs_SOURCE_DIR
}
/libobs
)
link_libraries
(
${
wxWidgets_LIBRARIES
}
)
link_libraries
(
${
wxWidgets_LIBRARIES
}
libobs
)
add_executable
(
obs
window-obs-basic.cpp
...
...
test/osx/CMakeLists.txt
浏览文件 @
e230b0e9
include_directories
(
${
obs_SOURCE_DIR
}
/libobs
)
include_directories
(
SYSTEM
${
obs_SOURCE_DIR
}
/libobs
)
find_library
(
COCOA Cocoa
)
include_directories
(
${
COCOA
}
)
...
...
test/osx/test.mm
浏览文件 @
e230b0e9
...
...
@@ -8,8 +8,8 @@
#import <AppKit/AppKit.h>
#import <OpenGL/OpenGL.h>
#include
"util/base.h"
#include
"obs.h"
#include
<util/base.h>
#include
<obs.h>
static
const
int
cx
=
800
;
static
const
int
cy
=
600
;
...
...
@@ -19,7 +19,7 @@ static const int cy = 600;
/* --------------------------------------------------- */
using
SourceContext
=
std
::
unique_ptr
<
obs_source
,
std
::
function
<
void
(
obs_source_t
)
>>
;
std
::
function
<
int
(
obs_source_t
)
>>
;
static
SourceContext
autorelease
(
obs_source_t
s
)
{
return
SourceContext
(
s
,
obs_source_release
);
...
...
test/test-input/CMakeLists.txt
浏览文件 @
e230b0e9
include_directories
(
${
obs_SOURCE_DIR
}
/libobs
)
include_directories
(
SYSTEM
${
obs_SOURCE_DIR
}
/libobs
)
add_library
(
test-input MODULE
test-filter.c
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录