Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-09-26 11:05:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2d7f5ddcbf7dbdeb32c22eed7136c8689ff30c72
2d7f5ddc
1 parent
83f266b9
add cmakelists.txt for cmake for clion of jetbrains. 0.9.214
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
59 行增加
和
5 行删除
trunk/CMakeLists.txt
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
trunk/CMakeLists.txt
0 → 100644
查看文件 @
2d7f5dd
cmake_minimum_required
(
VERSION 2.6.4
)
project
(
srs CXX
)
INCLUDE_DIRECTORIES
(
objs objs/st objs/hp src/core src/kernel src/rtmp src/app
)
set
(
SOURCE_FILES src/main/srs_main_server.cpp
)
AUX_SOURCE_DIRECTORY
(
src/core SOURCE_FILES
)
AUX_SOURCE_DIRECTORY
(
src/kernel SOURCE_FILES
)
AUX_SOURCE_DIRECTORY
(
src/rtmp SOURCE_FILES
)
AUX_SOURCE_DIRECTORY
(
src/app SOURCE_FILES
)
ADD_EXECUTABLE
(
srs
${
SOURCE_FILES
}
)
TARGET_LINK_LIBRARIES
(
srs dl
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/st/libst.a
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/openssl/lib/libssl.a
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/openssl/lib/libcrypto.a
)
TARGET_LINK_LIBRARIES
(
srs
${
PROJECT_SOURCE_DIR
}
/objs/hp/libhttp_parser.a
)
IF
(
NOT EXISTS
${
PROJECT_SOURCE_DIR
}
/objs/st/libst.a
)
MESSAGE
(
"srs_libs not found"
)
EXEC_PROGRAM
(
./configure
)
ENDIF
(
NOT EXISTS
${
PROJECT_SOURCE_DIR
}
/objs/st/libst.a
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
MESSAGE
(
STATUS
"only for jetbrains IDE, @see https://github.com/winlinvip/simple-rtmp-server/wiki/IDE#jetbrains"
)
...
...
trunk/src/core/srs_core.hpp
查看文件 @
2d7f5dd
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "21
3
"
#define VERSION_REVISION "21
4
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
2d7f5dd
...
...
@@ -55,7 +55,10 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
SrsConfig
*
_srs_config
=
new
SrsConfig
();
SrsServer
*
_srs_server
=
new
SrsServer
();
void
show_features
()
/**
* show the features by macro, the actual macro values.
*/
void
show_macro_features
()
{
#ifdef SRS_AUTO_SSL
srs_trace
(
"rtmp handshake: on"
);
...
...
@@ -130,11 +133,13 @@ void show_features()
#endif
}
// main entrance.
/**
* main entrance.
*/
int
main
(
int
argc
,
char
**
argv
)
{
int
ret
=
ERROR_SUCCESS
;
// TODO: support both little and big endian.
srs_assert
(
srs_is_little_endian
());
...
...
@@ -180,7 +185,7 @@ int main(int argc, char** argv)
srs_trace
(
"conf: %s, limit: %d"
,
_srs_config
->
config
().
c_str
(),
_srs_config
->
get_max_connections
());
// features
show_features
();
show_
macro_
features
();
/**
* we do nothing in the constructor of server,
...
...
请
注册
或
登录
后发表评论