Skip to content

Commit 263d8b3

Browse files
committed
fixed:linux build
fixed:configure error
1 parent a896c3a commit 263d8b3

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
{
2-
"tszIPAddr":"192.168.1.12",
2+
"tszIPAddr":"192.168.1.8",
33
"bDeamon":0,
44
"nCenterPort":5100,
55
"nStorageDLPort":5101,
66
"nStorageUPPort":5102,
7-
"nP2XPPort":5103,
87
"XMax":{
98
"MaxClient":10000,
109
"MaxQueue":10000,
1110
"IOThread":2,
1211
"CenterThread":2,
1312
"nStorageUPThread":2,
14-
"nStorageDLThread":2,
15-
"nP2XPThread":2
13+
"nStorageDLThread":2
1614
},
1715
"XTime":{
1816
"bHBTime":0,
1917
"nDBMonth":3,
2018
"nTimeCheck":3,
2119
"nCenterTimeOut":5,
22-
"nStorageTimeOut":5,
23-
"nP2XPTimeOut":5
20+
"nStorageTimeOut":5
2421
},
2522
"XLog":{
2623
"MaxSize":1024000,
@@ -56,13 +53,12 @@
5653
"XLimit":{
5754
"nDLTry":10,
5855
"nMaxUPLoad":4096000,
59-
"nMaxDNLoad":40960000
56+
"nMaxDNLoad":4096000
6057
},
6158
"XP2xp":{
6259
"nTime":2,
6360
"nSDPort":15000,
64-
"nRVPort":15001,
65-
"tszQQWryFile":"./XEngine_SQL/qqwry.dat"
61+
"nRVPort":15001
6662
},
6763
"XCert":{
6864
"bDLEnable":0,
@@ -74,6 +70,7 @@
7470
},
7571
"XVer":{
7672
"StorageVersion":[
73+
"3.7.0.1001 Build20220624",
7774
"3.6.0.1001 Build20220402",
7875
"3.5.1.1001 Build20220314",
7976
"3.5.0.1001 Build20220228",

XEngine_Source/XEngine_StorageApp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ CC = g++ -Wall
22
RELEASE = 0
33
UNICODE = 0
44
LOADBIN = -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 \
5-
-L ../StorageModule_Database -L ../StorageModule_P2XPPeer -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
5+
-L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp \
7-
-lStorageModule_Database -lStorageModule_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol \
7+
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol \
88
-ljsoncpp
99
LIBEX = -static-libgcc -ldl -lrt -lpthread
1010
LOADSO = -Wl,-rpath=./,--disable-new-dtags

0 commit comments

Comments
 (0)