mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-23 18:17:49 +08:00
Compare commits
2 Commits
2bbd177d5a
...
7d7320f0b7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d7320f0b7 | ||
|
|
6e125d02dc |
@ -198,7 +198,12 @@ if(UNIX)
|
|||||||
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
||||||
set(COMPILE_OPTIONS_DEFAULT ${COMPILE_OPTIONS_DEFAULT} "-g3")
|
set(COMPILE_OPTIONS_DEFAULT ${COMPILE_OPTIONS_DEFAULT} "-g3")
|
||||||
else()
|
else()
|
||||||
set(COMPILE_OPTIONS_DEFAULT ${COMPILE_OPTIONS_DEFAULT} "-g0")
|
find_program(OBJCOPY_FOUND objcopy)
|
||||||
|
if (OBJCOPY_FOUND)
|
||||||
|
set(COMPILE_OPTIONS_DEFAULT ${COMPILE_OPTIONS_DEFAULT} "-g3")
|
||||||
|
else()
|
||||||
|
set(COMPILE_OPTIONS_DEFAULT ${COMPILE_OPTIONS_DEFAULT} "-g0")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
|
|||||||
@ -66,3 +66,23 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(TARGETS MediaServer DESTINATION ${INSTALL_PATH_RUNTIME})
|
install(TARGETS MediaServer DESTINATION ${INSTALL_PATH_RUNTIME})
|
||||||
|
|
||||||
|
#relase 类型时额外输出debug调试信息
|
||||||
|
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
|
||||||
|
if(UNIX)
|
||||||
|
if("${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "release")
|
||||||
|
find_program(OBJCOPY_FOUND objcopy)
|
||||||
|
if (OBJCOPY_FOUND)
|
||||||
|
add_custom_command(TARGET MediaServer
|
||||||
|
POST_BUILD
|
||||||
|
COMMAND objcopy --only-keep-debug ${EXECUTABLE_OUTPUT_PATH}/MediaServer ${EXECUTABLE_OUTPUT_PATH}/MediaServer.debug
|
||||||
|
COMMAND objcopy --strip-all ${EXECUTABLE_OUTPUT_PATH}/MediaServer
|
||||||
|
COMMAND objcopy --add-gnu-debuglink=${EXECUTABLE_OUTPUT_PATH}/MediaServer.debug ${EXECUTABLE_OUTPUT_PATH}/MediaServer
|
||||||
|
)
|
||||||
|
install(FILES ${EXECUTABLE_OUTPUT_PATH}/MediaServer.debug DESTINATION ${INSTALL_PATH_RUNTIME})
|
||||||
|
else()
|
||||||
|
message(STATUS "not found objcopy, generate MediaServer.debug skip")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|||||||
@ -125,7 +125,7 @@ public:
|
|||||||
kUdpActive = 1, // udp主动模式,主动发送数据给对方
|
kUdpActive = 1, // udp主动模式,主动发送数据给对方
|
||||||
kTcpPassive = 2, // tcp被动模式,tcp服务器,等待对方连接并回复rtp
|
kTcpPassive = 2, // tcp被动模式,tcp服务器,等待对方连接并回复rtp
|
||||||
kUdpPassive = 3, // udp被动方式,等待对方发送nat打洞包,然后回复rtp至打洞包源地址
|
kUdpPassive = 3, // udp被动方式,等待对方发送nat打洞包,然后回复rtp至打洞包源地址
|
||||||
kVoiceTalk = 4, // 语音对讲模式,对方必须想推流上来,通过他的推流链路再回复rtp数据
|
kVoiceTalk = 4, // 语音对讲模式,对方必须先推流上来,通过他的推流链路再回复rtp数据
|
||||||
};
|
};
|
||||||
|
|
||||||
// rtp类型 [AUTO-TRANSLATED:acca40ab]
|
// rtp类型 [AUTO-TRANSLATED:acca40ab]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user