Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-22 00:42:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复编译问题

Browse Source
This commit is contained in:
xiongziliang
2018-03-21 11:35:00 +08:00
parent bec36b257e
commit 30aa71cb53
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ foreach(TEST_SRC ${TEST_SRC_LIST})
if(ANDROID)
target_link_libraries(${TEST_EXE_NAME} ${CMAKE_PROJECT_NAME}_static ${LINK_LIB_LIST})
elseif(WIN32)
target_link_libraries(${TEST_EXE_NAME} ${CMAKE_PROJECT_NAME}_shared ${LINK_LIB_LIST})
target_link_libraries(${TEST_EXE_NAME} ${CMAKE_PROJECT_NAME}_shared ${LINK_LIB_LIST} )
else()
target_link_libraries(${TEST_EXE_NAME} ${CMAKE_PROJECT_NAME}_shared ${LINK_LIB_LIST} pthread)
endif()

5
tests/test_server.cpp
View File

@@ -136,7 +136,7 @@ static onceToken s_token([](){
}, nullptr);
#if !defined(SIGHUP)
#defined SIGHUP 1
#define SIGHUP 1
#endif
int main(int argc,char *argv[]) {
@@ -148,7 +148,10 @@ int main(int argc,char *argv[]) {
Logger::Instance().add(std::make_shared<ConsoleChannel>("stdout", LTrace));
Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>());
//加载配置文件，如果配置文件不存在就创建一个
InfoL << mINI::Instance().dump();
Config::loadIniConfig();
InfoL << mINI::Instance().dump();
{
//这里是拉流地址，支持rtmp/rtsp协议，负载必须是H264+AAC