fixed:build error

Author: xengine-qyt

XEngine_Source/Makefile

@@ -4,41 +4,36 @@ UNICODE = 0
 FLAGS = RELEASE=$(RELEASE)
 
 STORAGE_SQL_PATH = ./XEngine_StorageComponents/XStorage_SQLPacket
-STORAGE_PROTOCOL_PATH = ./XEngine_StorageComponents/XStorage_Protocol
-P2XP_PEER_PATH = ./XEngine_P2XPComponents/XEngine_P2XPPeer
-P2XP_PROTOCOL_PATH = ./XEngine_P2XPComponents/XEngine_P2XPProtocol
+STORAGE_P2XP_PATH = ./XEngine_StorageComponents/XStorage_P2XPPeer
 
 BASE_CONFIG_PATH = ./StorageModule_Config
 BASE_SESSION_PATH = ./StorageModule_Session
 BASE_APIHELP_PATH = ./StorageModule_APIHelp
+BASE_PROTOCOL_PATH = ./StorageModule_Protocol
 
 APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
 
-NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_Protocol.so                       \
-                libXEngine_P2XPPeer.so libXEngine_P2XPProtocol.so                      \
-                libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so                 \
+NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_P2XPPeer.so                       \
+                libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so         \
 		 XEngine_StorageApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(NETENGINE_LIB)
 
 libXStorage_SQLPacket.so:
 	make -C $(STORAGE_SQL_PATH) $(FLAGS)
-libXStorage_Protocol.so:
-	make -C $(STORAGE_PROTOCOL_PATH) $(FLAGS)
+libXStorage_P2XPPeer.so:
+	make -C $(STORAGE_P2XP_PATH) $(FLAGS)
 
-libXEngine_P2XPPeer.so:
-	make -C $(P2XP_PEER_PATH) $(FLAGS)
-libXEngine_P2XPProtocol.so:
-	make -C $(P2XP_PROTOCOL_PATH) $(FLAGS)
-	
 libStorageModule_Config.so:
 	make -C $(BASE_CONFIG_PATH) $(FLAGS)
 libStorageModule_Session.so:
 	make -C $(BASE_SESSION_PATH) $(FLAGS)
 libStorageModule_APIHelp.so:
 	make -C $(BASE_APIHELP_PATH) $(FLAGS)
-
+libStorageModule_Protocol.so:
+	make -C $(BASE_PROTOCOL_PATH) $(FLAGS)
+	
 XEngine_StorageApp.exe:
 	make -C $(APPSERVICE_STORAGE_PATH) $(FLAGS)
 
@@ -50,6 +45,3 @@ InstallAll:SetFlags_Install $(NETENGINE_LIB)
 SetFlags_Clean:
 	export FLAGS=CleanAll
 CleanAll:SetFlags_Clean $(NETENGINE_LIB) 
-	
-	
-	

XEngine_Source/StorageModule_Protocol/Makefile

@@ -7,7 +7,7 @@ LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
 LIB = -lXEngine_BaseLib -ljsoncpp
 LIBEX = -static-libgcc -lrt -ldl 
 LOADSO = -Wl,-rpath=,--disable-new-dtags
-LIBINCLUDE = XStorageProtocol_Client.o XStorageProtocol_Proxy.o XStorageProtocol_Core.o pch.o
+LIBINCLUDE = Protocol_P2XPPacket.o Protocol_StoragePacket.o Protocol_P2XPParse.o Protocol_StorageParse.o pch.o
 
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
@@ -30,22 +30,24 @@ else
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE)  -o libXStorage_Protocol.so -shared $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
-
-XStorageProtocol_Client.o:./XStorageProtocol_Client/XStorageProtocol_Client.cpp                                 
-	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./XStorageProtocol_Client/XStorageProtocol_Client.cpp  
-XStorageProtocol_Proxy.o:./XStorageProtocol_Proxy/XStorageProtocol_Proxy.cpp                                 
-	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./XStorageProtocol_Proxy/XStorageProtocol_Proxy.cpp 
-XStorageProtocol_Core.o:./XStorageProtocol_Core/XStorageProtocol_Core.cpp                                 
-	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./XStorageProtocol_Core/XStorageProtocol_Core.cpp 
-
+	$(CC) $(DEBUG) $(LIBINCLUDE)  -o libStorageModule_Protocol.so -shared $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+
+Protocol_P2XPPacket.o:./Protocol_Packet/Protocol_P2XPPacket.cpp                                 
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./Protocol_Packet/Protocol_P2XPPacket.cpp  
+Protocol_StoragePacket.o:./Protocol_Packet/Protocol_StoragePacket.cpp                                 
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./Protocol_Packet/Protocol_StoragePacket.cpp 
+Protocol_P2XPParse.o:./Protocol_Parse/Protocol_P2XPParse.cpp                                 
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./Protocol_Parse/Protocol_P2XPParse.cpp 
+Protocol_StorageParse.o:./Protocol_Parse/Protocol_StorageParse.cpp                                 
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE)  ./Protocol_Parse/Protocol_StorageParse.cpp 
+	
 pch.o:pch.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libXStorage_Protocol.so
-	cp ./libXStorage_Protocol.so ../../../XEngine_Release/libXStorage_Protocol.so
+InstallSo:./libStorageModule_Protocol.so
+	cp ./libStorageModule_Protocol.so ../../XEngine_Release/libStorageModule_Protocol.so
 
 
 CleanAll:CleanObj CleanMk

XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_P2XPParse.h

@@ -21,6 +21,7 @@ class CProtocol_P2XPParse
     BOOL Protocol_P2XPParse_List(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszPubAddr, TCHAR* ptszPriAddr);
     BOOL Protocol_P2XPParse_User(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszUserName);
     BOOL Protocol_P2XPParse_Connect(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_P2XPIO_PROTOCOL* pSt_IOProtocol);
+
 protected:
 private:
 };

XEngine_Source/XEngine_StorageApp/Makefile

@@ -1,8 +1,8 @@
 CC = g++ -Wall
 RELEASE = 0
 UNICODE = 0  
-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_Protocol -L ../XEngine_P2XPComponents/XEngine_P2XPPeer -L ../XEngine_P2XPComponents/XEngine_P2XPProtocol -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp
-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_Protocol -lXEngine_P2XPPeer -lXEngine_P2XPProtocol -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp
+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
+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
 LIBEX = -static-libgcc -ldl -lrt -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_APPHelp.o Storage_TaskEvent.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

@@ -129,25 +129,24 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
 #pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
 #pragma comment(lib,"../x64/Release/StorageModule_Config.lib")
 #pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
+#pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib")
 #pragma comment(lib,"../x64/Release/XStorage_SQLPacket.lib")
-#pragma comment(lib,"../x64/Release/XStorage_Protocol.lib")
-#pragma comment(lib,"../x64/Release/XEngine_P2XPPeer.lib")
-#pragma comment(lib,"../x64/Release/XEngine_P2XPProtocol.lib")
+#pragma comment(lib,"../x64/Release/XStorage_P2XPPeer.lib")
 #else
 #ifdef _DEBUG
 #pragma comment(lib,"../Debug/StorageModule_Session.lib")
 #pragma comment(lib,"../Debug/StorageModule_Config.lib")
 #pragma comment(lib,"../Debug/StorageModule_APIHelp.lib")
 #pragma comment(lib,"../Debug/StorageModule_Protocol.lib")
 #pragma comment(lib,"../Debug/XStorage_SQLPacket.lib")
-#pragma comment(lib,"../Debug/XEngine_P2XPPeer.lib")
+#pragma comment(lib,"../Debug/XStorage_P2XPPeer.lib")
 #else
 #pragma comment(lib,"../Release/StorageModule_Session.lib")
 #pragma comment(lib,"../Release/StorageModule_Config.lib")
 #pragma comment(lib,"../Release/StorageModule_APIHelp.lib")
 #pragma comment(lib,"../Release/StorageModule_Protocol.lib")
 #pragma comment(lib,"../Release/XStorage_SQLPacket.lib")
-#pragma comment(lib,"../Release/XEngine_P2XPPeer.lib")
+#pragma comment(lib,"../Release/XStorage_P2XPPeer.lib")
 #endif
 #endif
 #endif

XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/Makefile

@@ -3,8 +3,8 @@ RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 FILECENTOS = /etc/redhat-release
-LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp
-LIB = -lXEngine_BaseLib -lNetHelp_APIHelp
+LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
+LIB = -lXEngine_BaseLib
 LIBEX = -static-libgcc -lrt -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = P2XPPeer_Manage.o pch.o
@@ -24,7 +24,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE)  -o libXEngine_P2XPPeer.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE)  -o libXStorage_P2XPPeer.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 
 P2XPPeer_Manage.o:./P2XPPeer_Manage/P2XPPeer_Manage.cpp                                 
@@ -35,8 +35,8 @@ pch.o:pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libXEngine_P2XPPeer.so 
-	cp ./libXEngine_P2XPPeer.so ../../../XEngine_Release/libXEngine_P2XPPeer.so
+InstallSo:./libXStorage_P2XPPeer.so 
+	cp ./libXStorage_P2XPPeer.so ../../../XEngine_Release/libXStorage_P2XPPeer.so
 
 
 CleanAll:CleanObj CleanMk