diff --git a/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs b/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs index f0d8780da..b5bfcb41d 100644 --- a/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs +++ b/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs @@ -190,6 +190,7 @@ private void BuildForMac() PublicDefinitions.Add("LUA_USE_MACOSX"); PublicAdditionalLibraries.Add(libFile); + RuntimeDependencies.Add(libFile); } private void BuildForIOS() diff --git a/Plugins/UnLua/Source/UnLua/Private/LuaEnv.cpp b/Plugins/UnLua/Source/UnLua/Private/LuaEnv.cpp index 4843ea0ee..8e5d4726e 100644 --- a/Plugins/UnLua/Source/UnLua/Private/LuaEnv.cpp +++ b/Plugins/UnLua/Source/UnLua/Private/LuaEnv.cpp @@ -99,7 +99,7 @@ namespace UnLua else { #if 504 == LUA_VERSION_NUM - lua_gc(L, LUA_GCGEN); + lua_gc(L, LUA_GCGEN, 0, 0); #else // default Lua GC config in UnLua lua_gc(L, LUA_GCSETPAUSE, 100); diff --git a/Plugins/UnLuaExtensions/LuaSocket/Source/src/auxiliar.cpp b/Plugins/UnLuaExtensions/LuaSocket/Source/src/auxiliar.cpp index 93a66a09f..3620e5460 100644 --- a/Plugins/UnLuaExtensions/LuaSocket/Source/src/auxiliar.cpp +++ b/Plugins/UnLuaExtensions/LuaSocket/Source/src/auxiliar.cpp @@ -51,7 +51,7 @@ int auxiliar_tostring(lua_State *L) { lua_pushstring(L, "class"); lua_gettable(L, -2); if (!lua_isstring(L, -1)) goto error; - sprintf(buf, "%p", lua_touserdata(L, 1)); + snprintf(buf,32,"%p", lua_touserdata(L, 1)); lua_pushfstring(L, "%s: %s", lua_tostring(L, -1), buf); return 1; error: @@ -88,7 +88,7 @@ void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) { void *data = auxiliar_getclassudata(L, classname, objidx); if (!data) { char msg[45]; - sprintf(msg, "%.35s expected", classname); + snprintf(msg,45,"%.35s expected", classname); luaL_argerror(L, objidx, msg); } return data; @@ -102,7 +102,7 @@ void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) { void *data = auxiliar_getgroupudata(L, groupname, objidx); if (!data) { char msg[45]; - sprintf(msg, "%.35s expected", groupname); + snprintf(msg,45,"%.35s expected", groupname); luaL_argerror(L, objidx, msg); } return data; diff --git a/Plugins/UnLuaExtensions/LuaSocket/Source/src/options.cpp b/Plugins/UnLuaExtensions/LuaSocket/Source/src/options.cpp index 2b53c67b7..a8640ce7b 100644 --- a/Plugins/UnLuaExtensions/LuaSocket/Source/src/options.cpp +++ b/Plugins/UnLuaExtensions/LuaSocket/Source/src/options.cpp @@ -35,7 +35,7 @@ int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps) opt++; if (!opt->func) { char msg[57]; - sprintf(msg, "unsupported option `%.35s'", name); + snprintf(msg,57,"unsupported option `%.35s'", name); luaL_argerror(L, 2, msg); } return opt->func(L, ps); @@ -48,7 +48,7 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps) opt++; if (!opt->func) { char msg[57]; - sprintf(msg, "unsupported option `%.35s'", name); + snprintf(msg,57,"unsupported option `%.35s'", name); luaL_argerror(L, 2, msg); } return opt->func(L, ps); diff --git a/Source/TPSProjectEditor.Target.cs b/Source/TPSProjectEditor.Target.cs index 724897f55..f9afa4f7b 100644 --- a/Source/TPSProjectEditor.Target.cs +++ b/Source/TPSProjectEditor.Target.cs @@ -15,9 +15,22 @@ using UnrealBuildTool; using System.Collections.Generic; -public class TPSProjectEditorTarget : TargetRules { public TPSProjectEditorTarget(TargetInfo Target) : base(Target) { Type = TargetType.Editor; +public class TPSProjectEditorTarget : TargetRules +{ + public TPSProjectEditorTarget(TargetInfo Target) : base(Target) + { + Type = TargetType.Editor; DefaultBuildSettings = BuildSettingsVersion.V2; - ExtraModuleNames.AddRange( new string[] { + ExtraModuleNames.AddRange( + new string[] + { "TPSProject" - } ); - } } \ No newline at end of file + } + ); + if (Platform == UnrealTargetPlatform.Mac) + { + bOverrideBuildEnvironment = true; + AdditionalCompilerArguments = "-Wno-unused-but-set-variable"; + } + } +} diff --git a/TPSProject.uproject b/TPSProject.uproject index 44304c170..95a4424af 100644 --- a/TPSProject.uproject +++ b/TPSProject.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "4.26", + "EngineAssociation": "4.27", "Category": "", "Description": "", "Modules": [