Skip to content

Commit 9c53fd0

Browse files
xengine-qytxengine-qyt
committed
fixed:linux build error
1 parent 25f9961 commit 9c53fd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+692
-602
lines changed

‎XEngine_Source/MQCore_ConfigModule/Config_Define.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
//////////////////////////////////////////////////////////////////////////
1616
typedef struct tag_XEngine_ServerConfig
1717
{
18-
TCHAR tszIPAddr[128];
19-
TCHAR tszTopic[128];
18+
XCHAR tszIPAddr[128];
19+
XCHAR tszTopic[128];
2020
bool bDeamon;
2121
int nTCPPort;
2222
int nHttpPort;
@@ -43,18 +43,18 @@ typedef struct tag_XEngine_ServerConfig
4343
}st_XLog;
4444
struct
4545
{
46-
TCHAR tszSQLAddr[128];
47-
TCHAR tszSQLUser[128];
48-
TCHAR tszSQLPass[128];
49-
TCHAR tszDBName[128];
46+
XCHAR tszSQLAddr[128];
47+
XCHAR tszSQLUser[128];
48+
XCHAR tszSQLPass[128];
49+
XCHAR tszDBName[128];
5050
int nSQLPort;
5151
}st_XSql;
5252
struct
5353
{
54-
TCHAR tszPassRegister[MAX_PATH];
55-
TCHAR tszPassUNReg[MAX_PATH];
56-
TCHAR tszPassLogin[MAX_PATH];
57-
TCHAR tszPassLogout[MAX_PATH];
54+
XCHAR tszPassRegister[MAX_PATH];
55+
XCHAR tszPassUNReg[MAX_PATH];
56+
XCHAR tszPassLogin[MAX_PATH];
57+
XCHAR tszPassLogout[MAX_PATH];
5858
int nTimeout;
5959
}st_XPass;
6060
struct
@@ -65,7 +65,7 @@ typedef struct tag_XEngine_ServerConfig
6565
//////////////////////////////////////////////////////////////////////////
6666
// 导出函数定义
6767
//////////////////////////////////////////////////////////////////////////
68-
extern "C" DWORD Config_GetLastError(int *pInt_ErrorCode = NULL);
68+
extern "C" XLONG Config_GetLastError(int *pInt_ErrorCode = NULL);
6969
/************************************************************************/
7070
/* 文件配置读取 */
7171
/************************************************************************/

‎XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
3636
Json::Value st_JsonRoot;
3737
Json::CharReaderBuilder st_JsonBuilder;
3838

39-
FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb"));
39+
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
4040
if (NULL == pSt_File)
4141
{
4242
Config_IsErrorOccur = true;
4343
Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_PARAMENT;
4444
return false;
4545
}
4646
int nCount = 0;
47-
TCHAR tszMsgBuffer[4096];
47+
XCHAR tszMsgBuffer[4096];
4848
while (1)
4949
{
5050
int nRet = fread(tszMsgBuffer + nCount, 1, 2048, pSt_File);
@@ -63,8 +63,8 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
6363
Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_PARSE;
6464
return false;
6565
}
66-
_tcscpy(pSt_ServerConfig->tszIPAddr,st_JsonRoot["tszIPAddr"].asCString());
67-
_tcscpy(pSt_ServerConfig->tszTopic, st_JsonRoot["tszTopic"].asCString());
66+
_tcsxcpy(pSt_ServerConfig->tszIPAddr,st_JsonRoot["tszIPAddr"].asCString());
67+
_tcsxcpy(pSt_ServerConfig->tszTopic, st_JsonRoot["tszTopic"].asCString());
6868
pSt_ServerConfig->bDeamon = st_JsonRoot["bDeamon"].asInt();
6969
pSt_ServerConfig->nTCPPort = st_JsonRoot["nTCPPort"].asInt();
7070
pSt_ServerConfig->nHttpPort = st_JsonRoot["nHttpPort"].asInt();
@@ -113,9 +113,9 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
113113
}
114114
Json::Value st_JsonXSql = st_JsonRoot["XSql"];
115115
pSt_ServerConfig->st_XSql.nSQLPort = st_JsonXSql["SQLPort"].asInt();
116-
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLAddr,st_JsonXSql["SQLAddr"].asCString());
117-
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLUser,st_JsonXSql["SQLUser"].asCString());
118-
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass,st_JsonXSql["SQLPass"].asCString());
116+
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLAddr,st_JsonXSql["SQLAddr"].asCString());
117+
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLUser,st_JsonXSql["SQLUser"].asCString());
118+
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLPass,st_JsonXSql["SQLPass"].asCString());
119119

120120
if (st_JsonRoot["XPass"].empty() || (5 != st_JsonRoot["XPass"].size()))
121121
{
@@ -125,10 +125,10 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
125125
}
126126
Json::Value st_JsonXPass = st_JsonRoot["XPass"];
127127
pSt_ServerConfig->st_XPass.nTimeout = st_JsonXPass["nTimeout"].asInt();
128-
_tcscpy(pSt_ServerConfig->st_XPass.tszPassLogin, st_JsonXPass["tszPassLogin"].asCString());
129-
_tcscpy(pSt_ServerConfig->st_XPass.tszPassLogout, st_JsonXPass["tszPassLogout"].asCString());
130-
_tcscpy(pSt_ServerConfig->st_XPass.tszPassRegister, st_JsonXPass["tszPassRegister"].asCString());
131-
_tcscpy(pSt_ServerConfig->st_XPass.tszPassUNReg, st_JsonXPass["tszPassUNReg"].asCString());
128+
_tcsxcpy(pSt_ServerConfig->st_XPass.tszPassLogin, st_JsonXPass["tszPassLogin"].asCString());
129+
_tcsxcpy(pSt_ServerConfig->st_XPass.tszPassLogout, st_JsonXPass["tszPassLogout"].asCString());
130+
_tcsxcpy(pSt_ServerConfig->st_XPass.tszPassRegister, st_JsonXPass["tszPassRegister"].asCString());
131+
_tcsxcpy(pSt_ServerConfig->st_XPass.tszPassUNReg, st_JsonXPass["tszPassUNReg"].asCString());
132132

133133
if (st_JsonRoot["XVer"].empty())
134134
{

‎XEngine_Source/MQCore_ConfigModule/Makefile‎

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2-
SHAREFLAG = -shared
3-
SHAREDLL = so
2+
PLATFORM = linux
3+
PLATVER =
4+
PLATDIR =
5+
FILEEXT =
6+
LIBFLAG =
47
RELEASE = 0
58
UNICODE = 0
6-
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
7-
LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
9+
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
10+
LOADSO = -L ../XEngine_ThirdPart/jsoncpp
811
LIB = -ljsoncpp
9-
LIBEX = -ldl -lpthread
10-
LOADSO = -Wl,-rpath=./,--disable-new-dtags
11-
LIBINCLUDE = Config_Json.o pch.o
12-
13-
ifeq ($(shell uname),Darwin)
14-
SHAREDLL = dylib
15-
SHAREFLAG = -dynamiclib
16-
LOADSO =
17-
else
18-
SHAREDLL = so
19-
SHAREFLAG = -shared
20-
endif
12+
LIBEX =
13+
OBJECTS = Config_Json.o pch.o
2114

2215
ifeq ($(RELEASE),1)
23-
FLAGS = -c -O2
16+
FLAGS = -c
2417
DEBUG =
2518
else
26-
FLAGS = -c
27-
DEBUG = -g
19+
FLAGS = -c -lc_p
20+
DEBUG = -g -pg
2821
endif
2922

3023
ifeq ($(UNICODE),1)
@@ -33,24 +26,46 @@ else
3326
UNICODE =
3427
endif
3528

29+
ifeq ($(PLATFORM),linux)
30+
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
31+
PLATVER = -D __CENTOS__
32+
PLATDIR = XEngine_Linux/Centos
33+
else
34+
PLATVER = -D __UBUNTU__
35+
PLATDIR = XEngine_Linux/Ubuntu
36+
endif
37+
FILEEXT = so
38+
LIBFLAG = -shared
39+
LIBEX = -lpthread -lrt -ldl
40+
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
41+
else ifeq ($(PLATFORM),mac)
42+
CC += -Wno-deprecated-declarations
43+
PLATVER = -D __MACOS__
44+
PLATDIR = XEngine_Mac
45+
FILEEXT = dylib
46+
LIBFLAG = -dynamiclib
47+
LIBEX = -lpthread -ldl
48+
LOADBIN = -Wl,-rpath,@loader_path/./
49+
endif
50+
3651

37-
all:$(LIBINCLUDE)
38-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ConfigModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
52+
all:$(OBJECTS)
53+
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_ConfigModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
3954

4055
Config_Json.o:./Config_Json/Config_Json.cpp
41-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Config_Json/Config_Json.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Config_Json/Config_Json.cpp
4257

4358
pch.o:./pch.cpp
44-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
4560

4661

4762
InstallAll:InstallSo
48-
InstallSo:./libMQCore_ConfigModule.$(SHAREDLL)
49-
cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.$(SHAREDLL)
63+
InstallSo:./libMQCore_ConfigModule.$(FILEEXT)
64+
cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.$(FILEEXT)
5065

5166

5267
CleanAll:CleanObj CleanMk
5368
CleanObj:
5469
rm *.o
5570
CleanMk:
56-
rm *.$(SHAREDLL)
71+
rm *.$(FILEEXT)

‎XEngine_Source/MQCore_ConfigModule/dllmain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pch.h"
33

44
bool APIENTRY DllMain( HMODULE hModule,
5-
DWORD ul_reason_for_call,
5+
XLONG ul_reason_for_call,
66
XPVOID lpReserved
77
)
88
{

‎XEngine_Source/MQCore_ConfigModule/pch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// History:
1313
*********************************************************************/
1414
bool Config_IsErrorOccur = false;
15-
DWORD Config_dwErrorCode = 0;
15+
XLONG Config_dwErrorCode = 0;
1616
//////////////////////////////////////////////////////////////////////
1717
CConfig_Json m_ConfigJson;
1818
//////////////////////////////////////////////////////////////////////
1919
// 导出函数定义
2020
//////////////////////////////////////////////////////////////////////
21-
extern "C" DWORD Config_GetLastError(int* pInt_ErrorCode)
21+
extern "C" XLONG Config_GetLastError(int* pInt_ErrorCode)
2222
{
2323
if (pInt_ErrorCode != NULL)
2424
{

‎XEngine_Source/MQCore_ConfigModule/pch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ typedef std::string tstring;
4343
// History:
4444
*********************************************************************/
4545
extern bool Config_IsErrorOccur;
46-
extern DWORD Config_dwErrorCode;
46+
extern XLONG Config_dwErrorCode;
4747

4848
#ifdef _MSC_BUILD
4949
#ifdef _DEBUG

‎XEngine_Source/MQCore_DBModule/DBModule_Define.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,44 @@ typedef void(CALLBACK* CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_TIMEPUBLISH)(LPCXST
2020
//消息队列
2121
typedef struct
2222
{
23-
TCHAR tszMsgBuffer[8192]; //消息内容
24-
TCHAR tszUserName[256]; //谁发布的消息
25-
TCHAR tszQueueName[256]; //此消息的KEY
26-
TCHAR tszQueueLeftTime[64]; //过期时间
27-
TCHAR tszQueuePublishTime[64]; //发布时间
28-
TCHAR tszQueueCreateTime[64]; //创建时间
23+
XCHAR tszMsgBuffer[8192]; //消息内容
24+
XCHAR tszUserName[256]; //谁发布的消息
25+
XCHAR tszQueueName[256]; //此消息的KEY
26+
XCHAR tszQueueLeftTime[64]; //过期时间
27+
XCHAR tszQueuePublishTime[64]; //发布时间
28+
XCHAR tszQueueCreateTime[64]; //创建时间
2929
__int64x nQueueSerial; //包序列号
3030
__int64x nQueueGetTime; //可以获取的次数
3131
int nMsgLen; //消息大小
32-
BYTE byMsgType; //消息类型,参考:ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE
32+
XBYTE byMsgType; //消息类型,参考:ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE
3333
}XENGINE_DBMESSAGEQUEUE;
3434
typedef struct
3535
{
36-
TCHAR tszQueueName[256]; //此消息的KEY
37-
TCHAR tszCreateTime[64]; //创建时间
36+
XCHAR tszQueueName[256]; //此消息的KEY
37+
XCHAR tszCreateTime[64]; //创建时间
3838
__int64x nIDMsg; //消息ID
3939
__int64x nIDTime; //发布时间
4040
}XENGINE_DBTIMERELEASE;
4141
//用户消息
4242
typedef struct
4343
{
44-
TCHAR tszUserName[MAX_PATH]; //用户名
45-
TCHAR tszKeyName[MAX_PATH]; //绑定的KEY
46-
TCHAR tszUPTime[64]; //最后更新时间
47-
TCHAR tszCreateTime[64]; //创建的时间
44+
XCHAR tszUserName[MAX_PATH]; //用户名
45+
XCHAR tszKeyName[MAX_PATH]; //绑定的KEY
46+
XCHAR tszUPTime[64]; //最后更新时间
47+
XCHAR tszCreateTime[64]; //创建的时间
4848
__int64x nKeySerial; //包序列号
4949
}XENGINE_DBUSERKEY;
5050
//主题所有者
5151
typedef struct
5252
{
53-
TCHAR tszQueueName[256]; //主题名称
54-
TCHAR tszUserName[256]; //主题所有者
55-
TCHAR tszCreateTime[64]; //创建时间
53+
XCHAR tszQueueName[256]; //主题名称
54+
XCHAR tszUserName[256]; //主题所有者
55+
XCHAR tszCreateTime[64]; //创建时间
5656
}XENGINE_DBTOPICOWNER;
5757
//////////////////////////////////////////////////////////////////////////
5858
// 导出的函数
5959
//////////////////////////////////////////////////////////////////////////
60-
extern "C" DWORD DBModule_GetLastError(int *pInt_SysError = NULL);
60+
extern "C" XLONG DBModule_GetLastError(int *pInt_SysError = NULL);
6161
/*************************************************************************
6262
消息队列导出函数
6363
**************************************************************************/

0 commit comments

Comments
 (0)