Skip to content

Commit d04c6a7

Browse files
xengine-qytxengine-qyt
committed
update:make file and build
1 parent 66fdc44 commit d04c6a7

File tree

14 files changed

+29
-46
lines changed

14 files changed

+29
-46
lines changed

‎XEngine_Source/AuthorizeModule_CDKey/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./
108
LIB = -lXEngine_BaseLib -lXEngine_SystemConfig
119
LIBEX =
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ bool CAuthClient_Connector::AuthClient_Connector_GetAuth(bool* pbAuth /* = NULL
150150
意思：是否成功
151151
备注：
152152
*********************************************************************/
153-
bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode /* = 0 */, XNETHANDLE xhToken /* = 0 */, XLONG dwCryption /* = 0 */)
153+
bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode /* = 0 */, XNETHANDLE xhToken /* = 0 */, XLONG dwCryption /* = 0 */)
154154
{
155155
AuthClient_IsErrorOccur = false;
156156

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CAuthClient_Connector
2626
bool AuthClient_Connector_Connect(LPCXSTR lpszClientAddr, int nPort, LPCXSTR lpszPass = NULL);
2727
bool AuthClient_Connector_Close();
2828
bool AuthClient_Connector_GetAuth(bool* pbAuth = NULL);
29-
bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
29+
bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
3030
bool AuthClient_Connector_Heart(bool bEnable = true);
3131
protected:
3232
static XHTHREAD CALLBACK AuthClient_Connector_Thread(XPVOID lParam);

‎XEngine_Source/AuthorizeModule_Client/AuthClient_Define.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ extern "C" bool AuthClient_Connector_GetAuth(bool* pbAuth = NULL);
9797
意思：是否成功
9898
备注：
9999
*********************************************************************/
100-
extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
100+
extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
101101
/********************************************************************
102102
函数名称：AuthClient_Connector_Heart
103103
函数功能：启用禁用客户端心跳

‎XEngine_Source/AuthorizeModule_Client/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
108
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
119
LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lXClient_Socket -lXClient_APIHelp -lXEngine_SystemApi
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Client/pch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern "C" bool AuthClient_Connector_GetAuth(bool* pbAuth)
4343
{
4444
return m_Connector.AuthClient_Connector_GetAuth(pbAuth);
4545
}
46-
extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode, XNETHANDLE xhToken, XLONG dwCryption)
46+
extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode, XNETHANDLE xhToken, XLONG dwCryption)
4747
{
4848
return m_Connector.AuthClient_Connector_Login(lpszUser, lpszPass, nDYCode, xhToken, dwCryption);
4949
}

‎XEngine_Source/AuthorizeModule_Configure/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
108
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
119
LIB = -ljsoncpp
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@ bool CDBModule_MySQL::DBModule_MySQL_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lp
622622
SQLPacket_IsErrorOccur = false;
623623

624624
XCHAR tszSQLStatement[1024]; //SQL语句
625-
char** ppszResult = NULL;
626625
__int64u nRow = 0;
627626
__int64u nColumn = 0;
628627
XNETHANDLE xhTable = 0;
@@ -644,7 +643,7 @@ bool CDBModule_MySQL::DBModule_MySQL_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lp
644643
SQLPacket_dwErrorCode = ERROR_AUTHORIZE_MODULE_DATABASE_NOTMATCH;
645644
return false;
646645
}
647-
ppszResult = DataBase_MySQL_GetResult(xhData, xhTable);
646+
DataBase_MySQL_FreeResult(xhData, xhTable);
648647
return true;
649648
}
650649
/********************************************************************

‎XEngine_Source/AuthorizeModule_Database/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./
108
LOADSO = -L ../AuthorizeModule_CDKey
119
LIB = -lXEngine_BaseLib -lHelpComponents_DataBase -lAuthorizeModule_CDKey
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Help/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./
108
LOADSO = -L
119
LIB = -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Protocol/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
108
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
119
LIB = -ljsoncpp -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/AuthorizeModule_Session/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./
108
LOADSO =
119
LIB = -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
2624
endif
2725

2826
ifeq ($(UNICODE),1)
29-
UNICODE = -D _UNICODE
27+
override UNICODE := -D __UNICODE__
3028
else
31-
UNICODE =
29+
override UNICODE := -D __ANSI__
3230
endif
3331

3432
ifeq ($(PLATFORM),linux)

‎XEngine_Source/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ else
4444
endif
4545

4646
libAuthorizeModule_CDKey.so:
47-
make -C $(AUTH_CDKEY_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
47+
make -C $(AUTH_CDKEY_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
4848
libAuthorizeModule_Session.so:
49-
make -C $(AUTH_SESSION_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
49+
make -C $(AUTH_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
5050
libAuthorizeModule_Database.so:
51-
make -C $(AUTH_DATABASE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
51+
make -C $(AUTH_DATABASE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
5252
libAuthorizeModule_Protocol.so:
53-
make -C $(AUTH_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
53+
make -C $(AUTH_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
5454
libAuthorizeModule_Configure.so:
55-
make -C $(AUTH_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
55+
make -C $(AUTH_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
5656
libAuthorizeModule_Help.so:
57-
make -C $(AUTH_HELP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
57+
make -C $(AUTH_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
5858
libAuthorizeModule_Client.so:
59-
make -C $(AUTH_CLIENT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
59+
make -C $(AUTH_CLIENT_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
6060

6161
XEngine_AuthorizeApp.exe:
62-
make -C $(AUTH_APP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
62+
make -C $(AUTH_APP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ PLATVER =
44
PLATDIR =
55
FILEEXT =
66
LIBFLAG =
7-
RELEASE = 0
8-
UNICODE = 0
97
LOADHDR = -I ./
108
LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Depend/XEngine_Module/XEngine_InfoReport \
119
-L ../../AuthorizeModule_Session -L ../../AuthorizeModule_Database -L ../../AuthorizeModule_Protocol -L ../../AuthorizeModule_Configure -L ../../AuthorizeModule_Help -L ../../AuthorizeModule_CDKey
@@ -31,9 +29,9 @@ else
3129
endif
3230

3331
ifeq ($(UNICODE),1)
34-
UNICODE = -D _UNICODE
32+
override UNICODE := -D __UNICODE__
3533
else
36-
UNICODE =
34+
override UNICODE := -D __ANSI__
3735
endif
3836

3937
ifeq ($(PLATFORM),linux)

0 commit comments

Comments
 (0)