Skip to content

Commit 2cbb47d

Browse files
committed
fixed:linux build
1 parent 592e353 commit 2cbb47d

File tree

4 files changed

+9
-18
lines changed

4 files changed

+9
-18
lines changed

XEngine_Source/XEngine.sln

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Phone", "XE
4242
EndProject
4343
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_IPAddr", "XEngine_PluginModule\ModulePlugin_IPAddr\ModulePlugin_IPAddr.vcxproj", "{D549160C-CC16-47F8-8345-1F4CF7A25CA2}"
4444
EndProject
45-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_ZHData", "XEngine_PluginModule\libModulePlugin_ZHData\libModulePlugin_ZHData.vcxproj", "{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}"
46-
EndProject
4745
Global
4846
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4947
Debug|x64 = Debug|x64
@@ -164,14 +162,6 @@ Global
164162
{D549160C-CC16-47F8-8345-1F4CF7A25CA2}.Release|x64.Build.0 = Release|x64
165163
{D549160C-CC16-47F8-8345-1F4CF7A25CA2}.Release|x86.ActiveCfg = Release|Win32
166164
{D549160C-CC16-47F8-8345-1F4CF7A25CA2}.Release|x86.Build.0 = Release|Win32
167-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Debug|x64.ActiveCfg = Debug|x64
168-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Debug|x64.Build.0 = Debug|x64
169-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Debug|x86.ActiveCfg = Debug|Win32
170-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Debug|x86.Build.0 = Debug|Win32
171-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Release|x64.ActiveCfg = Release|x64
172-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Release|x64.Build.0 = Release|x64
173-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Release|x86.ActiveCfg = Release|Win32
174-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B}.Release|x86.Build.0 = Release|Win32
175165
EndGlobalSection
176166
GlobalSection(SolutionProperties) = preSolution
177167
HideSolutionNode = FALSE
@@ -186,7 +176,6 @@ Global
186176
{6F111577-DAF8-4294-B516-0077C22D7613} = {D0473C03-9464-4C44-818A-AE212680CD05}
187177
{8FBC495D-C05E-49A4-B938-A81C9DFC1E5A} = {D0473C03-9464-4C44-818A-AE212680CD05}
188178
{D549160C-CC16-47F8-8345-1F4CF7A25CA2} = {D0473C03-9464-4C44-818A-AE212680CD05}
189-
{FD92AAD9-9B42-4A89-9A53-F801DB0DC95B} = {D0473C03-9464-4C44-818A-AE212680CD05}
190179
EndGlobalSection
191180
GlobalSection(ExtensibilityGlobals) = postSolution
192181
SolutionGuid = {9B202F91-A601-429E-BB0F-880DDEE096FE}

XEngine_Source/XEngine_ModuleDatabase/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LOADHDR = -I ./
1010
LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
1111
LIB = -lXEngine_BaseLib -lHelpComponents_DataBase
1212
LIBEX =
13-
OBJECTS = ModuleDatabase_IDCard.o ModuleDatabase_Bank.o ModuleDatabase_ZIPCode.o ModuleDatabase_XLog.o ModuleDatabase_ShortLink.o pch.o
13+
OBJECTS = ModuleDatabase_IDCard.o ModuleDatabase_Bank.o ModuleDatabase_ZIPCode.o ModuleDatabase_XLog.o ModuleDatabase_ShortLink.o ModuleDatabase_WordFilter.o pch.o
1414

1515
ifeq ($(RELEASE),1)
1616
FLAGS = -c
@@ -62,6 +62,8 @@ ModuleDatabase_XLog.o:./ModuleDatabase_XLog/ModuleDatabase_XLog.cpp
6262
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleDatabase_XLog/ModuleDatabase_XLog.cpp
6363
ModuleDatabase_ShortLink.o:./ModuleDatabase_ShortLink/ModuleDatabase_ShortLink.cpp
6464
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleDatabase_ShortLink/ModuleDatabase_ShortLink.cpp
65+
ModuleDatabase_WordFilter.o:./ModuleDatabase_WordFilter/ModuleDatabase_WordFilter.cpp
66+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleDatabase_WordFilter/ModuleDatabase_WordFilter.cpp
6567

6668
pch.o:./pch.cpp
6769
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
1515
-ljsoncpp
1616
LIBEX =
1717
OBJECTS = XEngine_Configure.o XEngine_Network.o XEngine_HTTPTask.o XEngine_PluginTask.o XEngine_HttpApp.o \
18-
TaskGet_Bank.o TaskGet_IDCard.o TaskGet_Language.o TaskGet_Locker.o TaskGet_Translation.o \
19-
TaskPost_DTest.o TaskPost_Log.o TaskPost_P2PClient.o TaskPost_PostCode.o TaskPost_QRCode.o TaskPost_ShortLink.o TaskPost_SocketTest.o
18+
TaskGet_Bank.o TaskGet_IDCard.o TaskGet_Language.o TaskGet_Locker.o TaskGet_Translation.o TaskGet_Reload.o \
19+
TaskPost_DTest.o TaskPost_Log.o TaskPost_P2PClient.o TaskPost_PostCode.o TaskPost_QRCode.o TaskPost_ShortLink.o TaskPost_SocketTest.o TaskPost_WordFilter.o
2020

2121
ifeq ($(RELEASE),1)
2222
FLAGS = -c
@@ -76,6 +76,8 @@ TaskGet_Locker.o:./XEngine_TaskGet/TaskGet_Locker.cpp
7676
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskGet/TaskGet_Locker.cpp
7777
TaskGet_Translation.o:./XEngine_TaskGet/TaskGet_Translation.cpp
7878
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskGet/TaskGet_Translation.cpp
79+
TaskGet_Reload.o:./XEngine_TaskGet/TaskGet_Reload.cpp
80+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskGet/TaskGet_Reload.cpp
7981

8082
TaskPost_DTest.o:./XEngine_TaskPost/TaskPost_DTest.cpp
8183
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskPost/TaskPost_DTest.cpp
@@ -91,6 +93,8 @@ TaskPost_ShortLink.o:./XEngine_TaskPost/TaskPost_ShortLink.cpp
9193
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskPost/TaskPost_ShortLink.cpp
9294
TaskPost_SocketTest.o:./XEngine_TaskPost/TaskPost_SocketTest.cpp
9395
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskPost/TaskPost_SocketTest.cpp
96+
TaskPost_WordFilter.o:./XEngine_TaskPost/TaskPost_WordFilter.cpp
97+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_TaskPost/TaskPost_WordFilter.cpp
9498

9599
XEngine_HttpApp.o:./XEngine_HttpApp.cpp
96100
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_HttpApp.cpp

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskGet/TaskGet_Reload.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
#include "../XEngine_Hdr.h"
22

3-
43
bool HTTPTask_TaskGet_Reload(LPCXSTR lpszClientAddr, LPCXSTR lpszOPCode)
54
{
65
int nMsgLen = 4096;
7-
int nPktLen = 4096;
86
XCHAR tszMsgBuffer[4096];
9-
XCHAR tszPktBuffer[4096];
107
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam; //发送给客户端的参数
118

129
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
13-
memset(tszPktBuffer, '\0', sizeof(tszPktBuffer));
1410
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
1511

1612
st_HDRParam.nHttpCode = 200; //HTTP CODE码

0 commit comments

Comments
 (0)