Skip to content

Commit 4956209

Browse files
committed
update:match xengine v8.25
1 parent 46ebc79 commit 4956209

File tree

9 files changed

+12
-13
lines changed

9 files changed

+12
-13
lines changed

XEngine_Source/StorageModule_APIHelp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
10-
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../XEngine_ThirdPart/jsoncpp
10+
LOADSO = -L ../XEngine_ThirdPart/jsoncpp
1111
LIB = -lXEngine_BaseLib -lXEngine_OPenSsl -lRfcComponents_HttpProtocol -lXEngine_SystemApi -ljsoncpp
1212
LIBEX =
1313
OBJECTS = APIHelp_Distributed.o APIHelp_Api.o pch.o

XEngine_Source/StorageModule_Database/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
10-
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
10+
LOADSO =
1111
LIB = -lXEngine_BaseLib -lHelpComponents_DataBase
1212
LIBEX =
1313
OBJECTS = Database_File.o Database_Memory.o Database_Help.o pch.o

XEngine_Source/StorageModule_Protocol/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
10-
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L ../XEngine_ThirdPart/jsoncpp
10+
LOADSO = -L ../XEngine_ThirdPart/jsoncpp
1111
LIB = -lXEngine_BaseLib -ljsoncpp
1212
LIBEX =
1313
OBJECTS = Protocol_StoragePacket.o Protocol_StorageParse.o pch.o

XEngine_Source/StorageModule_Session/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
10-
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
10+
LOADSO =
1111
LIB = -lXEngine_BaseLib
1212
LIBEX =
1313
OBJECTS = Session_DLStroage.o Session_UPStroage.o Session_User.o pch.o

XEngine_Source/VSCopy_Debug.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
55
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_OPenSsl.dll" "./"
66

77
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
8-
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIClient.dll" "./"
8+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
99

1010
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_DataBase.dll" "./"
1111
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"

XEngine_Source/VSCopy_x64.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
55
copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_OPenSsl.dll" "./"
66

77
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
8-
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
8+
copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
99

1010
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1111
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"

XEngine_Source/VSCopy_x86.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
55
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
66

77
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
8-
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
8+
copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
99

1010
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1111
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"

XEngine_Source/XEngine_StorageApp/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ PLATDIR =
55
RELEASE = 0
66
UNICODE = 0
77
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
8-
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp \
9-
-L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
10-
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpProtocol -lNetHelp_APIClient \
8+
LOADSO = -L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
9+
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXClient_APIHelp -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpProtocol \
1110
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol \
1211
-ljsoncpp
1312
LIBEX =

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ using namespace std;
3333
#include <XEngine_Include/XEngine_Core/ManagePool_Error.h>
3434
#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
3535
#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
36+
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
37+
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
3638
#include <XEngine_Include/XEngine_HelpComponents/XLog_Define.h>
3739
#include <XEngine_Include/XEngine_HelpComponents/XLog_Error.h>
3840
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
@@ -41,8 +43,6 @@ using namespace std;
4143
#include <XEngine_Include/XEngine_HelpComponents/Packets_Error.h>
4244
#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Define.h>
4345
#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Error.h>
44-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
45-
#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
4646
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
4747
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Error.h>
4848
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
@@ -112,10 +112,10 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
112112
#pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
113113
#pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
114114
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl.lib")
115+
#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
115116
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
116117
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_Packets.lib")
117118
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol.lib")
118-
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
119119
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
120120
#ifdef _WIN64
121121
#ifdef _DEBUG

0 commit comments

Comments
 (0)