update:make file and build

xengine-qyt · xengine-qyt · commit d04c6a746e11 · 2025-05-07T15:21:28.000+08:00
diff --git a/XEngine_Source/AuthorizeModule_CDKey/Makefile b/XEngine_Source/AuthorizeModule_CDKey/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./
 LIB = -lXEngine_BaseLib -lXEngine_SystemConfig
 LIBEX = 
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.cpp b/XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.cpp
@@ -150,7 +150,7 @@ bool CAuthClient_Connector::AuthClient_Connector_GetAuth(bool* pbAuth /* = NULL
   意思：是否成功
 备注：
 *********************************************************************/
-bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode /* = 0 */, XNETHANDLE xhToken /* = 0 */, XLONG dwCryption /* = 0 */)
+bool CAuthClient_Connector::AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode /* = 0 */, XNETHANDLE xhToken /* = 0 */, XLONG dwCryption /* = 0 */)
 {
 	AuthClient_IsErrorOccur = false;
 
diff --git a/XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.h b/XEngine_Source/AuthorizeModule_Client/AuthClient_Connector/AuthClient_Connector.h
@@ -26,7 +26,7 @@ class CAuthClient_Connector
 	bool AuthClient_Connector_Connect(LPCXSTR lpszClientAddr, int nPort, LPCXSTR lpszPass = NULL);
 	bool AuthClient_Connector_Close();
 	bool AuthClient_Connector_GetAuth(bool* pbAuth = NULL);
-	bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
+	bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
 	bool AuthClient_Connector_Heart(bool bEnable = true);
 protected:
 	static XHTHREAD CALLBACK AuthClient_Connector_Thread(XPVOID lParam);
diff --git a/XEngine_Source/AuthorizeModule_Client/AuthClient_Define.h b/XEngine_Source/AuthorizeModule_Client/AuthClient_Define.h
@@ -97,7 +97,7 @@ extern "C" bool AuthClient_Connector_GetAuth(bool* pbAuth = NULL);
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
+extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode = 0, XNETHANDLE xhToken = 0, XLONG dwCryption = 0);
 /********************************************************************
 函数名称：AuthClient_Connector_Heart
 函数功能：启用禁用客户端心跳
diff --git a/XEngine_Source/AuthorizeModule_Client/Makefile b/XEngine_Source/AuthorizeModule_Client/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
 LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
 LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lXClient_Socket -lXClient_APIHelp -lXEngine_SystemApi
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Client/pch.cpp b/XEngine_Source/AuthorizeModule_Client/pch.cpp
@@ -43,7 +43,7 @@ extern "C" bool AuthClient_Connector_GetAuth(bool* pbAuth)
 {
 	return m_Connector.AuthClient_Connector_GetAuth(pbAuth);
 }
-extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, int nDYCode, XNETHANDLE xhToken, XLONG dwCryption)
+extern "C" bool AuthClient_Connector_Login(LPCXSTR lpszUser, LPCXSTR lpszPass, XSHOT nDYCode, XNETHANDLE xhToken, XLONG dwCryption)
 {
 	return m_Connector.AuthClient_Connector_Login(lpszUser, lpszPass, nDYCode, xhToken, dwCryption);
 }
diff --git a/XEngine_Source/AuthorizeModule_Configure/Makefile b/XEngine_Source/AuthorizeModule_Configure/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
 LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp 
 LIB = -ljsoncpp
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp b/XEngine_Source/AuthorizeModule_Database/DBModule_MySQL/DBModule_MySQL.cpp
@@ -622,7 +622,6 @@ bool CDBModule_MySQL::DBModule_MySQL_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lp
 	SQLPacket_IsErrorOccur = false;
 
 	XCHAR tszSQLStatement[1024];    //SQL语句
-	char** ppszResult = NULL;
 	__int64u nRow = 0;
 	__int64u nColumn = 0;
 	XNETHANDLE xhTable = 0;
@@ -644,7 +643,7 @@ bool CDBModule_MySQL::DBModule_MySQL_QueryLogin(LPCXSTR lpszUserName, LPCXSTR lp
 		SQLPacket_dwErrorCode = ERROR_AUTHORIZE_MODULE_DATABASE_NOTMATCH;
 		return false;
 	}
-	ppszResult = DataBase_MySQL_GetResult(xhData, xhTable);
+	DataBase_MySQL_FreeResult(xhData, xhTable);
 	return true;
 }
 /********************************************************************
diff --git a/XEngine_Source/AuthorizeModule_Database/Makefile b/XEngine_Source/AuthorizeModule_Database/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./
 LOADSO = -L ../AuthorizeModule_CDKey
 LIB = -lXEngine_BaseLib -lHelpComponents_DataBase -lAuthorizeModule_CDKey
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Help/Makefile b/XEngine_Source/AuthorizeModule_Help/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./
 LOADSO = -L 
 LIB = -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Protocol/Makefile b/XEngine_Source/AuthorizeModule_Protocol/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
 LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp 
 LIB = -ljsoncpp -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/AuthorizeModule_Session/Makefile b/XEngine_Source/AuthorizeModule_Session/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./
 LOADSO =
 LIB = -lXEngine_BaseLib
@@ -26,9 +24,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)
diff --git a/XEngine_Source/Makefile b/XEngine_Source/Makefile
@@ -44,19 +44,19 @@ else
 endif
 
 libAuthorizeModule_CDKey.so:
-	make -C $(AUTH_CDKEY_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_CDKEY_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Session.so:
-	make -C $(AUTH_SESSION_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_SESSION_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Database.so:
-	make -C $(AUTH_DATABASE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_DATABASE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Protocol.so:
-	make -C $(AUTH_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_PROTOCOL_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Configure.so:
-	make -C $(AUTH_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_CONFIGURE_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Help.so:
-	make -C $(AUTH_HELP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 libAuthorizeModule_Client.so:
-	make -C $(AUTH_CLIENT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_CLIENT_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
 
 XEngine_AuthorizeApp.exe:
-	make -C $(AUTH_APP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+	make -C $(AUTH_APP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) $(FLAGS)
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Makefile b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Makefile
@@ -4,8 +4,6 @@ PLATVER =
 PLATDIR = 
 FILEEXT = 
 LIBFLAG = 
-RELEASE = 0
-UNICODE = 0
 LOADHDR = -I ./
 LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Depend/XEngine_Module/XEngine_InfoReport  \
          -L ../../AuthorizeModule_Session -L ../../AuthorizeModule_Database -L ../../AuthorizeModule_Protocol -L ../../AuthorizeModule_Configure -L ../../AuthorizeModule_Help -L ../../AuthorizeModule_CDKey 
@@ -31,9 +29,9 @@ else
 endif
 
 ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
+override UNICODE := -D __UNICODE__
 else
-UNICODE = 
+override UNICODE := -D __ANSI__
 endif
 
 ifeq ($(PLATFORM),linux)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ bool CAuthClient_Connector::AuthClient_Connector_GetAuth(bool* pbAuth /* = NULL`
`150`	`150`	`意思：是否成功`
`151`	`151`	`备注：`
`152`	`152`	`*********************************************************************/`
`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 */)`
`154`	`154`	`{`
`155`	`155`	`AuthClient_IsErrorOccur = false;`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ extern "C" bool AuthClient_Connector_GetAuth(bool* pbAuth)`
`43`	`43`	`{`
`44`	`44`	`return m_Connector.AuthClient_Connector_GetAuth(pbAuth);`
`45`	`45`	`}`
`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)`
`47`	`47`	`{`
`48`	`48`	`return m_Connector.AuthClient_Connector_Login(lpszUser, lpszPass, nDYCode, xhToken, dwCryption);`
`49`	`49`	`}`