Skip to content

Commit af75ff6

Browse files
committed
fixed:example build error
1 parent 215c8de commit af75ff6

File tree

6 files changed

+26
-28
lines changed

6 files changed

+26
-28
lines changed

XEngine_APPClient/APPClient_Download/APPClient_Download.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <windows.h>
77
#include <tchar.h>
88
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
9-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
9+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
1010
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
1111
#pragma comment(lib,"Ws2_32")
1212
#ifdef _WIN64
@@ -24,8 +24,8 @@
2424
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
28-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
27+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
28+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2929
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
3030
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
3131
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
@@ -34,8 +34,7 @@ using namespace std;
3434

3535
//需要优先配置XEngine
3636
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
37-
//linux::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.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
38-
//macos::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
37+
//linux macos::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXClient_APIHelp -lXEngine_SystemApi -ljsoncpp
3938

4039
typedef struct
4140
{
@@ -129,11 +128,11 @@ void P2PFile_Create(list<P2PFILE_INFO>* pStl_ListFile, LPCXSTR lpszFile)
129128
bool bComplete = true;
130129
for (unsigned int i = 0; i < pStl_ListFile->size(); i++)
131130
{
132-
NETHELP_FILEINFO st_TaskInfo;
133-
memset(&st_TaskInfo, '\0', sizeof(NETHELP_FILEINFO));
131+
XCLIENT_APIFILE st_TaskInfo;
132+
memset(&st_TaskInfo, '\0', sizeof(XCLIENT_APIFILE));
134133

135134
APIClient_File_Query(pSt_P2PFile[i].xhToken, &st_TaskInfo);
136-
if (ENUM_NETHELP_APICLIENT_FILE_STATUS_COMPLETE != st_TaskInfo.en_DownStatus)
135+
if (ENUM_XCLIENT_APIHELP_FILE_STATUS_COMPLETE != st_TaskInfo.en_DownStatus)
137136
{
138137
bComplete = FALSE;
139138
}

XEngine_APPClient/APPClient_RestApi/APPClient_RestApi.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
55
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#pragma comment(lib,"Ws2_32")
88
#ifdef _WIN64
99
#pragma comment(lib,"../../XEngine_Source/x64/Debug/jsoncpp")
@@ -23,15 +23,14 @@
2323
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2424
#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
2525
#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
26-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
27-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
26+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
27+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2828
using namespace std;
2929

30-
//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp -Wl,-rpath=../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib:../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp,--disable-new-dtags
3130
//需要优先配置XEngine
3231
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
3332
//linux使用下面的命令编译
34-
//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp
33+
//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXClient_APIHelp -ljsoncpp
3534

3635
XCHAR tszBaseBuffer[MAX_PATH];
3736
XCHAR tszHdrBuffer[MAX_PATH];

XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPFile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ int main(int argc, char** argv)
7272
for (; stl_ListIterator != stl_ListUPDate.end(); stl_ListIterator++)
7373
{
7474
XCHAR tszPathFile[1024];
75-
NETHELP_FILEINFO st_TaskInfo;
75+
XCLIENT_APIFILE st_TaskInfo;
7676

7777
memset(tszPathFile, '\0', sizeof(tszPathFile));
78-
memset(&st_TaskInfo, '\0', sizeof(NETHELP_FILEINFO));
78+
memset(&st_TaskInfo, '\0', sizeof(XCLIENT_APIFILE));
7979

8080
_xstprintf(tszPathFile, _X("%s%s"), stl_ListIterator->tszModulePath, stl_ListIterator->tszModuleName);
8181
_xtremove(tszPathFile);
@@ -87,7 +87,7 @@ int main(int argc, char** argv)
8787
{
8888
break;
8989
}
90-
if (ENUM_NETHELP_APICLIENT_FILE_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)
90+
if (ENUM_XCLIENT_APIHELP_FILE_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)
9191
{
9292
break;
9393
}

XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPHdr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"Ws2_32.lib")
55
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
77
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
88
#ifdef _WIN64
99
#pragma comment(lib,"../../../XEngine_Source/x64/Debug/jsoncpp")
@@ -24,8 +24,8 @@ using namespace std;
2424
#include <XEngine_Include/XEngine_Types.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
28-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
27+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
28+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2929
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
3030
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
3131
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>

XEngine_APPClient/APPClient_UPDate/APPClient_UPMaker/APPClient_UPMaker.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#pragma comment(lib,"Ws2_32.lib")
66
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
77
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
8-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
8+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
99
#ifdef _WIN64
1010
#pragma comment(lib,"../../../XEngine_Source/x64/Debug/jsoncpp")
1111
#else
@@ -28,8 +28,8 @@ using namespace std;
2828
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
2929
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
3030
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
31-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
32-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
31+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
32+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
3333

3434
typedef struct
3535
{
@@ -75,7 +75,7 @@ bool HelpModule_Api_BuildVer(XCHAR* ptszLocalBuffer, XCHAR* ptszRemoteBuffer, in
7575
XCHAR** ppszListDir;
7676
list<HELPMODULE_FILELIST> stl_ListFile;
7777
//枚举文件
78-
if (!SystemApi_File_EnumFile(lpszPath, &ppszListDir, &nListCount, NULL, NULL, bSubDir, 1))
78+
if (!SystemApi_File_EnumFile(lpszPath, &ppszListDir, &nListCount, bSubDir, 1))
7979
{
8080
return FALSE;
8181
}

XEngine_APPClient/APPClient_UPDownload/APPClient_UPDownload.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <tchar.h>
44
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
55
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
6-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
6+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
77
#pragma comment(lib,"Ws2_32")
88
#pragma comment(lib,"../../XEngine_Source/Debug/jsoncpp")
99
#ifdef _WIN64
@@ -24,14 +24,14 @@
2424
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2525
#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
2626
#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
27-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
28-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
27+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
28+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2929
using namespace std;
3030

3131
//需要优先配置XEngine
3232
//WINDOWS使用VS2022 x86 或者 x64 debug 编译
33-
//linux::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -ljsoncpp
34-
//macos::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -ljsoncpp
33+
//linux macos::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lXClient_APIHelp -ljsoncpp
34+
3535

3636
//上传文件
3737
void File_UPLoad()

0 commit comments

Comments
 (0)