Skip to content

Commit c9dc787

Browse files
xengine-qytxengine-qyt
committed
fixed:makefile build error
1 parent d1457c0 commit c9dc787

6 files changed

Lines changed: 31 additions & 12 deletions

File tree

‎XEngine_Source/Makefile‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PLATFORM=linux
44
FLAGS=
55

66
THIRD_JSONCPP_PATH = ./XEngine_Depend/XEngine_Module/jsoncpp
7+
THIRD_TINYXML_PATH = ./XEngine_Depend/XEngine_Module/tinyxml2
78
THIRD_REPORT_PATH = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
89

910
BASE_SQL_PATH = ./StorageModule_Database
@@ -15,17 +16,31 @@ BASE_BTORRENT_PATH = ./StorageModule_BTorrent
1516

1617
APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
1718

18-
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so \
19+
XENGINE_MODULES = libjsoncpp.so libtinyxml2.so libXEngine_InfoReport.so \
1920
libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so \
2021
XEngine_StorageApp.exe
2122

2223
.PHONY:MakeAll
2324
MakeAll:$(XENGINE_MODULES)
2425

2526
libjsoncpp.so:
27+
ifeq ($(FLAGS), InstallAll)
28+
cp $(THIRD_JSONCPP_PATH)/libjsoncpp.so ../XEngine_Release/
29+
else
2630
make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
31+
endif
32+
libtinyxml2.so:
33+
ifeq ($(FLAGS), InstallAll)
34+
cp $(THIRD_TINYXML_PATH)/libtinyxml2.so ../XEngine_Release/
35+
else
36+
make -C $(THIRD_TINYXML_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
37+
endif
2738
libXEngine_InfoReport.so:
39+
ifeq ($(FLAGS), InstallAll)
40+
cp $(THIRD_REPORT_PATH)/libXEngine_InfoReport.so ../XEngine_Release/
41+
else
2842
make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
43+
endif
2944

3045
libStorageModule_Database.so:
3146
make -C $(BASE_SQL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

‎XEngine_Source/StorageModule_Protocol/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ FILEEXT =
66
LIBFLAG =
77
RELEASE = 0
88
UNICODE = 0
9-
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
10-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
11-
LIB = -lXEngine_BaseLib -ljsoncpp
9+
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp -I ../XEngine_Depend/XEngine_Module/tinyxml2
10+
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/tinyxml2
11+
LIB = -lXEngine_BaseLib -ljsoncpp -ltinyxml2
1212
LIBEX =
1313
OBJECTS = Protocol_StoragePacket.o Protocol_StorageParse.o pch.o
1414

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
80+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;$(IncludePath)</IncludePath>
8181
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8484
<LinkIncremental>true</LinkIncremental>
85-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
85+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;$(IncludePath)</IncludePath>
8686
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8989
<LinkIncremental>false</LinkIncremental>
90-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
90+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;$(IncludePath)</IncludePath>
9191
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
9292
</PropertyGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎XEngine_Source/StorageModule_Session/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LOADHDR = -I ./
1010
LOADSO =
1111
LIB = -lXEngine_BaseLib
1212
LIBEX =
13-
OBJECTS = Session_DLStroage.o Session_UPStroage.o Session_User.o Session_Action.o pch.o
13+
OBJECTS = Session_DLStroage.o Session_UPStroage.o Session_User.o Session_Action.o Session_Webdav.o pch.o
1414

1515
ifeq ($(RELEASE),1)
1616
FLAGS = -c
@@ -60,6 +60,8 @@ Session_User.o:./Session_User/Session_User.cpp
6060
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Session_User/Session_User.cpp
6161
Session_Action.o:./Session_Action/Session_Action.cpp
6262
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Session_Action/Session_Action.cpp
63+
Session_Webdav.o:./Session_Webdav/Session_Webdav.cpp
64+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Session_Webdav/Session_Webdav.cpp
6365

6466
pch.o:./pch.cpp
6567
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp

‎XEngine_Source/XEngine_StorageApp/Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ PLATDIR =
55
RELEASE = 0
66
UNICODE = 0
77
LOADHDR = -I ./
8-
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport \
8+
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/tinyxml2 -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport \
99
-L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../StorageModule_BTorrent -L ../StorageModule_InfoReport
1010
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXClient_APIHelp -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpProtocol \
1111
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -lStorageModule_BTorrent \
12-
-ljsoncpp -lXEngine_InfoReport
12+
-ljsoncpp -ltinyxml2 -lXEngine_InfoReport
1313
LIBEX =
1414
OBJECTS = Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o Storage_TaskAction.o \
15-
StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o XEngine_StorageApp.o
15+
StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_Webdav.o XEngine_StorageApp.o
1616

1717
ifeq ($(RELEASE),1)
1818
FLAGS = -c
@@ -59,6 +59,8 @@ StorageApp_Center.o:./StorageApp_Center.cpp
5959
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StorageApp_Center.cpp
6060
StorageApp_UPLoader.o:./StorageApp_UPLoader.cpp
6161
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StorageApp_UPLoader.cpp
62+
StorageApp_Webdav.o:./StorageApp_Webdav.cpp
63+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./StorageApp_Webdav.cpp
6264

6365
Storage_TaskPass.o:./Storage_APPTask/Storage_TaskPass.cpp
6466
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Storage_APPTask/Storage_TaskPass.cpp

‎XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
179179
XCHAR tszStroageKey[MAX_PATH] = {};
180180
XCHAR tszFileName[MAX_PATH] = {};
181181

182-
int nRet = _stxscanf(pSt_HTTPParam->tszHttpUri + 1, _T("%99[^/]/%199[^\n]"), tszStroageKey, tszFileName);
182+
int nRet = _stxscanf(pSt_HTTPParam->tszHttpUri + 1, _X("%99[^/]/%199[^\n]"), tszStroageKey, tszFileName);
183183
if (2 != nRet)
184184
{
185185
st_HDRParam.nHttpCode = 413;

0 commit comments

Comments
 (0)