Skip to content

Commit de40c79

Browse files
committed
fixed:macos build error
1 parent 3bf8c73 commit de40c79

File tree

10 files changed

+15
-12
lines changed

10 files changed

+15
-12
lines changed

XEngine_Source/XEngine_ModuleDatabase/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_XLog/ModuleDatabase_XLog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ BOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_X
198198
return FALSE;
199199
}
200200
//查询
201-
XHDATA xhTable = 0;
201+
XNETHANDLE xhTable = 0;
202202
__int64u nllLine = 0;
203203
__int64u nllRow = 0;
204204

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_ModulePlugin/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ UNICODE = 0
66
FILECENTOS=/etc/redhat-release
77
INCLUDE = -I ./
88
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
9-
LIB = -lXEngine_BaseLib -llua5.3
9+
LIB =
1010
LIBEX = -ldl -lpthread
1111
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1212
LIBINCLUDE = ModulePlugin_LibCore.o ModulePlugin_LuaCore.o ModulePlugin_Loader.o pch.o
1313

1414
ifeq ($(shell uname),Darwin)
1515
SHAREDLL = dylib
1616
SHAREFLAG = -dynamiclib
17+
LIB = -lXEngine_BaseLib -llua
1718
LOADSO =
1819
else
1920
SHAREDLL = so
2021
SHAREFLAG = -shared
22+
LIB = -lXEngine_BaseLib -llua5.3
2123
endif
2224

2325
ifeq ($(RELEASE),1)

XEngine_Source/XEngine_ModuleProtocol/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++17 -fPIC -Wno-deprecated-declarations
22
SHAREFLAG = -shared
33
SHAREDLL = so
44
RELEASE = 0

XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Plugin_Timezone/Plugin_Timezone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ BOOL CPlugin_Timezone::Plugin_Timezone_Count(TCHAR* ptszMsgBufer, int* pInt_Len)
579579
Json::Value st_JsonObject;
580580
Json::StreamWriterBuilder st_JsonBuilder;
581581

582-
st_JsonObject["Count"] = stl_MapTimezone.size();
582+
st_JsonObject["Count"] = (Json::Value::UInt)stl_MapTimezone.size();
583583
st_JsonRoot["data"] = st_JsonObject;
584584
st_JsonRoot["code"] = 0;
585585
st_JsonRoot["msg"] = "success";

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
CC = g++ -Wall
1+
CC = g++ -Wall -Wno-deprecated-declarations
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_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp \
5-
-L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin \
6-
-L ../../XEngine_ThirdPart/jsoncpp
5+
-L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin \
6+
-L ../../XEngine_ThirdPart/jsoncpp
77
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lHelpComponents_XLog -lRfcComponents_HttpServer -lNetHelp_APIClient \
88
-lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleHelp -lXEngine_ModulePlugin \
99
-ljsoncpp
@@ -16,6 +16,7 @@ ifeq ($(shell uname),Darwin)
1616
LOADSO =
1717
endif
1818

19+
1920
ifeq ($(RELEASE),1)
2021
FLAGS = -c -O2
2122
DEBUG =

0 commit comments

Comments
 (0)