Skip to content

Commit 771b30b

Browse files
xengine-qytxengine-qyt
committed
fixed:build error for example
1 parent 33195ab commit 771b30b

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

‎XEngine_APPClient/APPClient_FLVPull/APPClient_FLVPull.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <windows.h>
33
#include <tchar.h>
44
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
5-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
5+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
66
#pragma comment(lib,"Ws2_32")
77
#endif
88
#include <list>
@@ -12,15 +12,14 @@
1212
#include <XEngine_Include/XEngine_ProtocolHdr.h>
1313
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
1414
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
15-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
16-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
15+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
16+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
1717
#include "../../XEngine_Source/XEngine_UserProtocol.h"
1818
using namespace std;
1919

2020
//需要优先配置XEngine
2121
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
22-
//linux::g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
23-
//macos::g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
22+
//g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -lXEngine_BaseLib -lXClient_APIHelp
2423
FILE* pSt_File;
2524

2625
static void CALLBACK APPClient_FLVPull_Callback(XNETHANDLE xhToken, XPVOID lpszMsgBuffer, int nMsgLen, XPVOID lParam)

‎XEngine_APPClient/APPClient_JT1078/APPClient_JT1078.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ using namespace std;
2626

2727
//需要优先配置XEngine
2828
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
29-
//linux::g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
30-
//macos::g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
29+
//g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -lXEngine_BaseLib -lXEngine_OPenSsl -lXClient_Socket -lXEngine_AVHelp
3130

3231
void XEngine_Device_StrtoBCD(LPCXSTR lpszPhoneCode, XBYTE* ptszBCD)
3332
{

‎XEngine_APPClient/APPClient_SRTPull/APPClient_SRTPull.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#include <XEngine_Include/XEngine_Types.h>
1111
//需要优先配置XEngine
1212
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
13-
//linux::g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
14-
//macos::g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
13+
//g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
14+
1515
FILE* pSt_File;
1616

1717
int nPort = 10080;
18-
LPCXSTR lpszServiceAddr = _X("10.0.3.155");
18+
LPCXSTR lpszServiceAddr = _X("127.0.0.1");
1919

2020
int main()
2121
{
@@ -71,7 +71,7 @@ int main()
7171
{
7272
fwrite(tszMsgBuffer, 1, ret, pSt_File);
7373
}
74-
74+
printf("%d\n", ret);
7575
if (nTimeEnd - nTimeStart > 20)
7676
{
7777
break;

‎XEngine_APPClient/APPClient_XStream/APPClient_XStream.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <tchar.h>
44
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
55
#pragma comment(lib,"XEngine_Client/XClient_Socket")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
67
#pragma comment(lib,"XEngine_AVCodec/XEngine_AVCollect")
78
#pragma comment(lib,"XEngine_AVCodec/XEngine_VideoCodec")
8-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
99
#pragma comment(lib,"Ws2_32")
1010
#endif
1111
#include <list>
@@ -17,25 +17,25 @@
1717
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
1818
#include <XEngine_Include/XEngine_Client/XClient_Define.h>
1919
#include <XEngine_Include/XEngine_Client/XClient_Error.h>
20+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
21+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2022
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
2123
#include <XEngine_Include/XEngine_AVCodec/AVCollect_Error.h>
2224
#include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
2325
#include <XEngine_Include/XEngine_AVCodec/VideoCodec_Error.h>
24-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
25-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
2626
#include "../../XEngine_Source/XEngine_UserProtocol.h"
2727
using namespace std;
2828

2929
//需要优先配置XEngine
3030
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
31-
//linux::g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
32-
//macos::g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
31+
//g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -lXEngine_BaseLib -lXClient_Socket -lXClient_APIHelp -lXEngine_AVCollect -lXEngine_VideoCodec
32+
3333
XSOCKET hSocket = 0;
3434
XNETHANDLE xhVideo = 0;
3535
__int64u nTimeVideo = 0;
3636
FILE* pSt_File = NULL;
3737

38-
void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t* punStringU, int nULen, uint8_t* punStringV, int nVLen, XPVOID lParam)
38+
void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t* punStringU, int nULen, uint8_t* punStringV, int nVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
3939
{
4040
XCHAR* ptszMsgBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_MAX);
4141
XENGINE_PROTOCOLHDR st_ProtocolHdr;
@@ -75,7 +75,7 @@ void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t*
7575
free(ptszMsgBuffer);
7676
ptszMsgBuffer = NULL;
7777
}
78-
void CALLBACK XEngine_AVCollect_CBAudio(uint8_t* punStringAudio, int nVLen, XPVOID lParam)
78+
void CALLBACK XEngine_AVCollect_CBAudio(uint8_t* punStringAudio, int nVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
7979
{
8080

8181
}

0 commit comments

Comments
 (0)