增加：UE5.2的编译支持

Author: xuyanghuang-tencent

Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs

@@ -84,13 +84,13 @@ private void BuildForWin64()
 
     private void BuildForAndroid()
     {
-        var NDKRoot = Environment.GetEnvironmentVariable("NDKROOT");
-        if (NDKRoot == null)
+        var ndkRoot = Environment.GetEnvironmentVariable("NDKROOT");
+        if (ndkRoot == null)
             throw new BuildException("can't find NDKROOT");
 
-        var toolchain = AndroidExports.CreateToolChain(Target.ProjectFile);
-        var NdkApiLevel = toolchain.GetNdkApiLevelInt(21);
-
+        var toolchain = GetAndroidToolChain();
+        var ndkApiLevel = toolchain.GetNdkApiLevelInt(21);
+        Console.WriteLine("toolchain.GetNdkApiLevelInt=", ndkApiLevel);
         var abiNames = new[] { "armeabi-v7a", "arm64-v8a", "x86_64" };
         foreach (var abiName in abiNames)
         {
@@ -102,16 +102,30 @@ private void BuildForAndroid()
             EnsureDirectoryExists(libFile);
             var args = new Dictionary<string, string>
             {
-                { "CMAKE_TOOLCHAIN_FILE", Path.Combine(NDKRoot, "build/cmake/android.toolchain.cmake") },
+                { "CMAKE_TOOLCHAIN_FILE", Path.Combine(ndkRoot, "build/cmake/android.toolchain.cmake") },
                 { "ANDROID_ABI", abiName },
-                { "ANDROID_PLATFORM", "android-" + NdkApiLevel }
+                { "ANDROID_PLATFORM", "android-" + ndkApiLevel }
             };
             var buildDir = CMake(args);
             var buildFile = Path.Combine(buildDir, m_LibName);
             File.Copy(buildFile, libFile, true);
         }
     }
 
+    private IAndroidToolChain GetAndroidToolChain()
+    {
+#if UE_5_2_OR_LATER
+        var ueBuildPlatformType = Assembly.GetAssembly(typeof(IAndroidToolChain)).GetType("UnrealBuildTool.UEBuildPlatform");
+        var getBuildPlatformMethod = ueBuildPlatformType.GetMethod("GetBuildPlatform", BindingFlags.Static | BindingFlags.Public);
+        var androidBuildPlatform = getBuildPlatformMethod.Invoke(null, new object[] { UnrealTargetPlatform.Android });
+        var createTempToolChainForProjectMethod = androidBuildPlatform.GetType().GetMethod("CreateTempToolChainForProject");
+        var toolchain = (IAndroidToolChain)createTempToolChainForProjectMethod.Invoke(androidBuildPlatform, new object[] { Target.ProjectFile });
+#else
+        var toolchain = AndroidExports.CreateToolChain(Target.ProjectFile);
+#endif
+        return toolchain;
+    }
+
     private void BuildForLinux()
     {
         var libFile = GetLibraryPath();
@@ -174,14 +188,18 @@ private void BuildForLinuxAArch64()
 
     private void BuildForMac()
     {
+#if UE_5_2_OR_LATER
+        var abiName = Target.Architecture.ToString();
+#else
         var abiName = Target.Architecture;
+#endif
         var libFile = GetLibraryPath(abiName);
         if (!File.Exists(libFile))
         {
             EnsureDirectoryExists(libFile);
             var args = new Dictionary<string, string>
             {
-                { "CMAKE_OSX_ARCHITECTURES", Target.Architecture }
+                { "CMAKE_OSX_ARCHITECTURES", abiName }
             };
             var buildDir = CMake(args);
             var buildFile = Path.Combine(buildDir, m_LibName);
@@ -237,7 +255,7 @@ private void BuildForPS5()
         var args = new Dictionary<string, string>
         {
             { "CMAKE_TOOLCHAIN_FILE", Path.Combine(sceRootDir, @"Prospero\Tools\CMake\PS5.cmake") },
-            { "PS5", "1"}
+            { "PS5", "1" }
         };
         var buildDir = CMake(args);
         var buildFile = Path.Combine(buildDir, m_Config, m_LibName);
@@ -381,7 +399,7 @@ private string GetLuaVersion()
             return version;
         return "lua-5.4.3";
     }
-    
+
     private void EnsureDirectoryExists(string fileName)
     {
         var dirName = Path.GetDirectoryName(fileName);

Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include "CoreUObject.h"
+#include "Misc/EngineVersionComparison.h"
 #include <type_traits>
 
 namespace UnLua
@@ -38,7 +39,17 @@ namespace UnLua
         template<class T1, class T2>
         static int32 Identical(...);
     };
-    template<typename T1, typename T2 = T1> struct THasEqualityOperator { enum { Value = TIsSame<decltype(FHasEqualityOperatorImpl::Identical<T1, T2>(nullptr)), bool>::Value }; };
+    template<typename T1, typename T2 = T1> struct THasEqualityOperator
+    {
+        enum
+        {
+#if UE_VERSION_OLDER_THAN(5, 2, 0)
+            Value = TIsSame<decltype(FHasEqualityOperatorImpl::Identical<T1, T2>(nullptr)), bool>::Value
+#else
+            Value = std::is_same_v<decltype(FHasEqualityOperatorImpl::Identical<T1, T2>(nullptr)), bool>
+#endif
+        };
+    };
 
 
     /**

Plugins/UnLua/Source/UnLua/UnLua.Build.cs

@@ -25,7 +25,11 @@ public class UnLua : ModuleRules
 {
     public UnLua(ReadOnlyTargetRules Target) : base(Target)
     {
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
         bEnforceIWYU = false;
+#endif
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
         PublicIncludePaths.AddRange(

Plugins/UnLua/Source/UnLuaDefaultParamCollector/UnLuaDefaultParamCollector.Build.cs

@@ -21,7 +21,11 @@ public class UnLuaDefaultParamCollector : ModuleRules
     {
         public UnLuaDefaultParamCollector(ReadOnlyTargetRules Target) : base(Target)
         {
-            bEnforceIWYU = false;
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
+        bEnforceIWYU = false;
+#endif
 
             PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
 

Plugins/UnLua/Source/UnLuaEditor/UnLuaEditor.Build.cs

@@ -19,7 +19,11 @@ public class UnLuaEditor : ModuleRules
 {
     public UnLuaEditor(ReadOnlyTargetRules Target) : base(Target)
     {
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
         bEnforceIWYU = false;
+#endif
 
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 

Plugins/UnLuaExtensions/LuaProtobuf/Source/LuaProtobuf.Build.cs

@@ -20,7 +20,11 @@ public class LuaProtobuf : ModuleRules
 {
     public LuaProtobuf(ReadOnlyTargetRules Target) : base(Target)
     {
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
         bEnforceIWYU = false;
+#endif
         bUseUnity = false;
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         bEnableUndefinedIdentifierWarnings = false;

Plugins/UnLuaExtensions/LuaRapidjson/Source/LuaRapidjson.Build.cs

@@ -20,7 +20,11 @@ public class LuaRapidjson : ModuleRules
 {
     public LuaRapidjson(ReadOnlyTargetRules Target) : base(Target)
     {
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
         bEnforceIWYU = false;
+#endif
         bUseUnity = false;
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         bEnableUndefinedIdentifierWarnings = false;

Plugins/UnLuaExtensions/LuaSocket/Source/LuaSocket.Build.cs

@@ -20,7 +20,11 @@ public class LuaSocket : ModuleRules
 {
     public LuaSocket(ReadOnlyTargetRules Target) : base(Target)
     {
+#if UE_5_2_OR_LATER
+        IWYUSupport = IWYUSupport.None;
+#else
         bEnforceIWYU = false;
+#endif
         bUseUnity = false;
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         bEnableUndefinedIdentifierWarnings = false;

Plugins/UnLuaTestSuite/Source/UnLuaTestSuite/Private/Tests/Issue473Test.cpp

@@ -38,8 +38,8 @@ struct FUnLuaTest_Issue473 : FUnLuaTestBase
         )";
         UnLua::RunChunk(L, Chunk);
 
-        const auto Actual = UTF8_TO_TCHAR(lua_tostring(L, -1));
-        RUNNER_TEST_EQUAL(Actual, TEXT("虚幻引擎"));
+        const auto Actual = lua_tostring(L, -1);
+        RUNNER_TEST_EQUAL(UTF8_TO_TCHAR(Actual), TEXT("虚幻引擎"));
         return true;
     }
 };

Source/TPSProject/TutorialObject.cpp

@@ -25,8 +25,7 @@ static int32 FTutorialObject_New(lua_State* L)
     }
 
     const auto UserData = NewUserdataWithPadding(L, sizeof(FTutorialObject), "FTutorialObject");
-    const auto Name = UTF8_TO_TCHAR(NameChars);
-	new(UserData) FTutorialObject(Name);
+	new(UserData) FTutorialObject(UTF8_TO_TCHAR(NameChars));
     return 1;
 }