Merge branch 'feature/ps5' into develop

Author: xuyanghuang-tencent

Plugins/UnLua/Source/ThirdParty/Lua/CMakeLists.txt

@@ -52,6 +52,18 @@ elseif(APPLE)
             ${LUA_CORE}
         )
     endif()
+elseif(PS5)
+    add_definitions(-DLUA_NO_OS_EXECUTE)
+    add_definitions(-DLUA_NO_OS_TMPNAME)
+    add_definitions(-DLUA_NO_IO_TMPFILE)
+    add_library(Lua STATIC
+        ${LUA_CORE}
+    )
+    target_include_directories(Lua SYSTEM
+        PRIVATE ${SCE_PROSPERO_SDK_DIR}/target/include
+        PRIVATE ${SCE_PROSPERO_SDK_DIR}/target/include_common
+        PRIVATE ${LUA_SRC_PATH}/../src-ps5
+    )
 else()
     add_library(Lua STATIC
         ${LUA_CORE}

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

@@ -171,7 +171,7 @@ private void BuildForLinuxAArch64()
         var buildFile = Path.Combine(buildDir, m_LibName);
         File.Copy(buildFile, libFile, true);
     }
-    
+
     private void BuildForMac()
     {
         var abiName = Target.Architecture;
@@ -212,6 +212,38 @@ private void BuildForIOS()
         PublicAdditionalLibraries.Add(libFile);
     }
 
+    private void BuildForPS5()
+    {
+        var libFile = GetLibraryPath();
+        PublicAdditionalLibraries.Add(libFile);
+        PublicIncludePaths.Add(Path.Combine(ModuleDirectory, m_LuaDirName, "src-ps5"));
+
+        if (File.Exists(libFile))
+            return;
+
+        var sceRootDir = Environment.GetEnvironmentVariable("SCE_ROOT_DIR");
+        if (string.IsNullOrEmpty(sceRootDir))
+            throw new BuildException("SCE_ROOT_DIR environment variable needed.");
+
+        var sceSdkDir = Environment.GetEnvironmentVariable("SCE_PROSPERO_SDK_DIR");
+        if (string.IsNullOrEmpty(sceSdkDir))
+            throw new BuildException("SCE_PROSPERO_SDK_DIR environment variable needed.");
+
+        EnsureDirectoryExists(libFile);
+        var sysRoot = Path.Combine(sceSdkDir, @"target");
+        var clangPath = Path.Combine(sceSdkDir, @"host_tools/bin/prospero-clang.exe");
+        var clangPlusPlusPath = Path.Combine(sceSdkDir, @"host_tools/bin/prospero-clang.exe");
+        var arPath = Path.Combine(sceSdkDir, @"host_tools/bin/prospero-llvm-ar.exe");
+        var args = new Dictionary<string, string>
+        {
+            { "CMAKE_TOOLCHAIN_FILE", Path.Combine(sceRootDir, @"Prospero\Tools\CMake\PS5.cmake") },
+            { "PS5", "1"}
+        };
+        var buildDir = CMake(args);
+        var buildFile = Path.Combine(buildDir, m_Config, m_LibName);
+        File.Copy(buildFile, libFile, true);
+    }
+
     #endregion
 
     private string CMake(Dictionary<string, string> extraArgs = null)
@@ -284,7 +316,7 @@ private string CMake(Dictionary<string, string> extraArgs = null)
                 foreach (var arg in extraArgs)
                     writer.Write(" -D{0}={1}", arg.Key, arg.Value);
                 writer.WriteLine();
-                writer.WriteLine("cd ../.."); 
+                writer.WriteLine("cd ../..");
                 writer.WriteLine("cmake --build {0}/build --config {1}", m_LuaDirName, m_Config);
             }
 
@@ -391,6 +423,7 @@ private string GetBuildSystem()
                 return "Xcode";
             return "Unix Makefiles";
         }
+
         return null;
     }
 
@@ -410,4 +443,4 @@ private void SetupForRuntimeDependency(string fullPath, string platform)
     private readonly string m_LuaDirName;
     private readonly string m_BuildSystem;
     private readonly bool m_CompileAsCpp;
-}
+}

Plugins/UnLua/Source/ThirdParty/Lua/lua-5.4.3/src-ps5/signal.h

@@ -0,0 +1,6 @@
+#pragma once
+#ifndef _PS5_SIGNAL
+#define _PS5_SIGNAL
+#endif
+
+#include <sys/signal.h>

Plugins/UnLua/Source/ThirdParty/Lua/lua-5.4.3/src/liolib.c

@@ -299,9 +299,13 @@ static int io_popen (lua_State *L) {
 
 
 static int io_tmpfile (lua_State *L) {
+#if defined(LUA_NO_IO_TMPFILE)
+  return 0;
+#else
   LStream *p = newfile(L);
   p->f = tmpfile();
   return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+#endif
 }
 
 

Plugins/UnLua/Source/ThirdParty/Lua/lua-5.4.3/src/loslib.c

@@ -172,13 +172,17 @@ static int os_rename (lua_State *L) {
 
 
 static int os_tmpname (lua_State *L) {
+#if defined(LUA_NO_OS_TMPNAME)
+  return 0;
+#else
   char buff[LUA_TMPNAMBUFSIZE];
   int err;
   lua_tmpnam(buff, err);
   if (l_unlikely(err))
     return luaL_error(L, "unable to generate a unique filename");
   lua_pushstring(L, buff);
   return 1;
+#endif
 }
 
 

Plugins/UnLua/Source/UnLua/Private/DefaultParamCollection.cpp

@@ -17,7 +17,7 @@
 
 TMap<FName, FFunctionCollection> GDefaultParamCollection;
 
-#pragma optimize("", off)
+PRAGMA_DISABLE_OPTIMIZATION
 
 void CreateDefaultParamCollection()
 {
@@ -30,4 +30,4 @@ void CreateDefaultParamCollection()
     }
 }
 
-#pragma optimize("", on)
+PRAGMA_ENABLE_OPTIMIZATION