Skip to content

Commit 1b253b7

Browse files
xengine-qytxengine-qyt
committed
support linux build
1 parent 786b2c3 commit 1b253b7

File tree

7 files changed

+82
-30
lines changed

7 files changed

+82
-30
lines changed

‎XEngine_Source/Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ UNICODE = 0
33

44
FLAGS = RELEASE=$(RELEASE)
55

6+
THIRD_JSONCPP_PATH = ./XEngine_ThirdPart/jsoncpp
7+
68
STORAGE_SQL_PATH = ./XEngine_StorageComponents/XStorage_SQLPacket
79
STORAGE_P2XP_PATH = ./XEngine_StorageComponents/XStorage_P2XPPeer
810

@@ -13,13 +15,17 @@ BASE_PROTOCOL_PATH = ./StorageModule_Protocol
1315

1416
APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
1517

16-
NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_P2XPPeer.so \
18+
NETENGINE_LIB = libjsoncpp.so \
19+
libXStorage_SQLPacket.so libXStorage_P2XPPeer.so \
1720
libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so \
1821
XEngine_StorageApp.exe
1922

2023
.PHONY:MakeAll
2124
MakeAll:$(NETENGINE_LIB)
2225

26+
libjsoncpp.so:
27+
make -C $(THIRD_JSONCPP_PATH) $(FLAGS)
28+
2329
libXStorage_SQLPacket.so:
2430
make -C $(STORAGE_SQL_PATH) $(FLAGS)
2531
libXStorage_P2XPPeer.so:

‎XEngine_Source/StorageModule_APIHelp/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CC = g++ -Wall -std=c++17 -fPIC
22
RELEASE = 0
33
UNICODE = 0
4-
INCLUDE = -I ./
5-
LOADBIN =
6-
LIB =
4+
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
5+
LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
6+
LIB = -ljsoncpp
77
LIBEX = -static-libgcc -lrt -ldl -lpthread
8-
LOADSO = -Wl,-rpath=
8+
LOADSO = -Wl,-rpath=./,--disable-new-dtags
99
LIBINCLUDE = APIHelp_Distributed.o APIHelp_Api.o pch.o
1010

1111
ifeq ($(RELEASE),1)

‎XEngine_Source/StorageModule_Config/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CC = g++ -Wall -std=c++17 -fPIC
22
RELEASE = 0
33
UNICODE = 0
4-
INCLUDE = -I ./
5-
LOADBIN =
4+
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
5+
LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
66
LIB = -ljsoncpp
77
LIBEX = -static-libgcc -lrt -ldl -lpthread
8-
LOADSO = -Wl,-rpath=
8+
LOADSO = -Wl,-rpath=./,--disable-new-dtags
99
LIBINCLUDE = Config_Json.o pch.o
1010

1111
ifeq ($(RELEASE),1)

‎XEngine_Source/StorageModule_Protocol/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
CC = g++ -Wall -std=c++17 -fPIC
22
RELEASE = 0
33
UNICODE = 0
4-
INCLUDE = -I ./
4+
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
55
FILECENTOS = /etc/redhat-release
6-
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
6+
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L ../XEngine_ThirdPart/jsoncpp
77
LIB = -lXEngine_BaseLib -ljsoncpp
88
LIBEX = -static-libgcc -lrt -ldl
9-
LOADSO = -Wl,-rpath=,--disable-new-dtags
9+
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1010
LIBINCLUDE = Protocol_P2XPPacket.o Protocol_StoragePacket.o Protocol_P2XPParse.o Protocol_StorageParse.o pch.o
1111

1212
ifeq ($(RELEASE),1)
@@ -33,16 +33,16 @@ all:$(LIBINCLUDE)
3333
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Protocol.so -shared $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
3434

3535
Protocol_P2XPPacket.o:./Protocol_Packet/Protocol_P2XPPacket.cpp
36-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_P2XPPacket.cpp
36+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_P2XPPacket.cpp
3737
Protocol_StoragePacket.o:./Protocol_Packet/Protocol_StoragePacket.cpp
38-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_StoragePacket.cpp
38+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_StoragePacket.cpp
3939
Protocol_P2XPParse.o:./Protocol_Parse/Protocol_P2XPParse.cpp
40-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Parse/Protocol_P2XPParse.cpp
40+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Parse/Protocol_P2XPParse.cpp
4141
Protocol_StorageParse.o:./Protocol_Parse/Protocol_StorageParse.cpp
42-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Parse/Protocol_StorageParse.cpp
42+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Parse/Protocol_StorageParse.cpp
4343

4444
pch.o:pch.cpp
45-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) pch.cpp
45+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) pch.cpp
4646

4747

4848
InstallAll:InstallSo

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuf
8383
st_JsonObject["tszFileUser"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileUser;
8484
st_JsonObject["tszFileHash"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileHash;
8585
st_JsonObject["tszFileTime"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileTime;
86-
st_JsonObject["nFileSize"] = (*pppSt_DBFile)[i]->st_ProtocolFile.nFileSize;
86+
st_JsonObject["nFileSize"] = (Json::Value::Int64)(*pppSt_DBFile)[i]->st_ProtocolFile.nFileSize;
8787
//只有在P2P下取文件列表才有效
8888
if (_tcslen((*pppSt_DBFile)[i]->tszTableName) > 0)
8989
{
@@ -165,11 +165,11 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_Info(TCHAR* ptszMsgBuffer,
165165
Json::Value st_JsonObject;
166166
st_JsonObject["tszClientAddr"] = (*pppSt_DLInfo)[i]->tszClientAddr;
167167
st_JsonObject["tszFilePath"] = (*pppSt_DLInfo)[i]->tszFileDir;
168-
st_JsonObject["ullCount"] = (*pppSt_DLInfo)[i]->ullCount;
169-
st_JsonObject["ullRWCount"] = (*pppSt_DLInfo)[i]->ullRWCount;
170-
st_JsonObject["ullRWLen"] = (*pppSt_DLInfo)[i]->ullRWLen;
171-
st_JsonObject["ullPosStart"] = (*pppSt_DLInfo)[i]->ullPosStart;
172-
st_JsonObject["ullPosEnd"] = (*pppSt_DLInfo)[i]->ullPosEnd;
168+
st_JsonObject["ullCount"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullCount;
169+
st_JsonObject["ullRWCount"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullRWCount;
170+
st_JsonObject["ullRWLen"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullRWLen;
171+
st_JsonObject["ullPosStart"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullPosStart;
172+
st_JsonObject["ullPosEnd"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullPosEnd;
173173

174174
st_JsonDLArray.append(st_JsonObject);
175175
}
@@ -178,11 +178,11 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_Info(TCHAR* ptszMsgBuffer,
178178
Json::Value st_JsonObject;
179179
st_JsonObject["tszClientAddr"] = (*pppSt_DLInfo)[i]->tszClientAddr;
180180
st_JsonObject["tszFilePath"] = (*pppSt_DLInfo)[i]->tszFileDir;
181-
st_JsonObject["ullCount"] = (*pppSt_DLInfo)[i]->ullCount;
182-
st_JsonObject["ullRWCount"] = (*pppSt_DLInfo)[i]->ullRWCount;
183-
st_JsonObject["ullRWLen"] = (*pppSt_DLInfo)[i]->ullRWLen;
184-
st_JsonObject["ullPosStart"] = (*pppSt_DLInfo)[i]->ullPosStart;
185-
st_JsonObject["ullPosEnd"] = (*pppSt_DLInfo)[i]->ullPosEnd;
181+
st_JsonObject["ullCount"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullCount;
182+
st_JsonObject["ullRWCount"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullRWCount;
183+
st_JsonObject["ullRWLen"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullRWLen;
184+
st_JsonObject["ullPosStart"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullPosStart;
185+
st_JsonObject["ullPosEnd"] = (Json::Value::Int64)(*pppSt_DLInfo)[i]->ullPosEnd;
186186

187187
st_JsonUPArray.append(st_JsonObject);
188188
}
@@ -384,7 +384,7 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_UPDown(TCHAR* ptszMsgBuffer
384384
st_JsonRoot["lpszBuckKey"] = lpszBuckKey;
385385
st_JsonRoot["lpszFileName"] = lpszFileName;
386386
st_JsonRoot["lpszClientAddr"] = lpszClientAddr;
387-
st_JsonRoot["nFileSize"] = nFileSize;
387+
st_JsonRoot["nFileSize"] = (Json::Value::Int64)nFileSize;
388388
if (NULL == lpszFileHash)
389389
{
390390
st_JsonRoot["lpszFileHash"];

‎XEngine_Source/XEngine_StorageApp/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CC = g++ -Wall
22
RELEASE = 0
33
UNICODE = 0
4-
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 -L ../XEngine_StorageComponents/XStorage_SQLPacket -L ../XEngine_StorageComponents/XStorage_P2XPPeer -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol
5-
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_NetXApi -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol
4+
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 -L ../XEngine_StorageComponents/XStorage_SQLPacket -L ../XEngine_StorageComponents/XStorage_P2XPPeer -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
5+
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_NetXApi -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -ljsoncpp
66
LIBEX = -static-libgcc -ldl -lrt -lpthread
77
LOADSO = -Wl,-rpath=./,--disable-new-dtags
88
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o

‎XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
CC = g++ -Wall -std=c++17 -fPIC
2+
RELEASE = 0
3+
UNICODE = 0
4+
INCLUDE = -I ./
5+
FILECENTOS = /etc/redhat-release
6+
LOADBIN =
7+
LIB =
8+
LIBEX = -static-libgcc -lrt -ldl -lpthread
9+
LOADSO = -Wl,-rpath=
10+
LIBINCLUDE = json_reader.o json_value.o json_writer.o
11+
12+
ifeq ($(RELEASE),1)
13+
FLAGS = -c -O2
14+
DEBUG =
15+
else
16+
FLAGS = -c -lc_p
17+
DEBUG = -g -pg
18+
endif
19+
20+
ifeq ($(UNICODE),1)
21+
UNICODE = -D _UNICODE
22+
else
23+
UNICODE =
24+
endif
25+
26+
all:$(LIBINCLUDE)
27+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libjsoncpp.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
28+
29+
json_reader.o:json_reader.cpp
30+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_reader.cpp
31+
json_value.o:json_value.cpp
32+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_value.cpp
33+
json_writer.o:json_writer.cpp
34+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_writer.cpp
35+
36+
InstallAll:InstallSo
37+
InstallSo:./libjsoncpp.so
38+
cp ./libjsoncpp.so ../../../XEngine_Release/libjsoncpp.so
39+
40+
41+
42+
CleanAll:CleanObj CleanMk
43+
CleanObj:
44+
rm *.o
45+
CleanMk:
46+
rm *.so

0 commit comments

Comments
 (0)