Skip to content

Commit c38c3ab

Browse files
committed
modify:does not report info when test start
fixed:link library error on mac
1 parent 24fa4d2 commit c38c3ab

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,19 @@ MACRO_SRT_SUPPORT := $(shell gcc -E -dM ../XEngine_BuildSwitch.h | grep _XENGINE
1616
MACRO_RTC_SUPPORT := $(shell gcc -E -dM ../XEngine_BuildSwitch.h | grep _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC | cut -d ' ' -f 3)
1717

1818
ifeq ($(MACRO_SRT_SUPPORT),1)
19-
LIB += -lsrt-gnutls
19+
ifeq ($(PLATFORM),mac)
20+
LIB += -lsrt
21+
else
22+
LIB += -lsrt-gnutls
23+
endif
2024
endif
2125
ifeq ($(MACRO_RTC_SUPPORT),1)
22-
LIB += -lsrtp2
26+
27+
ifeq ($(PLATFORM),mac)
28+
LIB += -lsrtp
29+
else
30+
LIB += -lsrtp2
31+
endif
2332
endif
2433

2534
ifeq ($(RELEASE),1)

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ int main(int argc, char** argv)
577577
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,HLS(M3U8)文件流被设置为禁用"));
578578
}
579579
//发送信息报告
580-
if (st_ServiceConfig.st_XReport.bEnable)
580+
if (st_ServiceConfig.st_XReport.bEnable && !bIsTest)
581581
{
582582
if (InfoReport_APIMachine_Send(st_ServiceConfig.st_XReport.tszAPIUrl, st_ServiceConfig.st_XReport.tszServiceName))
583583
{

0 commit comments

Comments
 (0)