Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Lua-5.3.6, Android Add x86_64 Architecture #230

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public Lua(ReadOnlyTargetRules Target) : base(Target)
Type = ModuleType.External;

if (Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Mac ||
Target.Platform == UnrealTargetPlatform.IOS || Target.Platform == UnrealTargetPlatform.Android)
Target.Platform == UnrealTargetPlatform.IOS || Target.Platform == UnrealTargetPlatform.Android ||
Target.Platform == UnrealTargetPlatform.Linux /* || Target.Platform == UnrealTargetPlatform.LinuxAArch64 */)
{
string LuaDynLibName = "";
string LuaDynamicLibPath = "";
Expand All @@ -50,15 +51,25 @@ public Lua(ReadOnlyTargetRules Target) : base(Target)
{
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/IOS/liblua.a"));
}
else // UnrealTargetPlatform.Android
else if (Target.Platform == UnrealTargetPlatform.Android) // UnrealTargetPlatform.Android
{
//PublicLibraryPaths.Add(Path.Combine(ModuleDirectory, "lib/Android/ARMv7"));
//PublicLibraryPaths.Add(Path.Combine(ModuleDirectory, "lib/Android/ARM64"));
//PublicAdditionalLibraries.Add("lua");
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Android/ARMv7/liblua.a"));
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Android/ARM64/liblua.a"));
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Android/x86_64/liblua.a"));
}

else if (Target.Platform == UnrealTargetPlatform.Linux)// UnrealTargetPlatform.Linux || UnrealTargetPlatform.LinuxAArch64
{
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Linux/x86_64/liblua.a"));
}
/* else if (Target.Platform == UnrealTargetPlatform.LinuxAArch64)
{
PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Linux/arch64/liblua.a"));
}
*/

if (Target.bBuildEditor == true)
{
PublicDelayLoadDLLs.Add(LuaDynLibName);
Expand Down
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/binaries/Mac/liblua.dylib
Binary file not shown.
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/binaries/Win64/Lua.dll
Binary file not shown.
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/binaries/Win64/Lua.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lauxlib.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lauxlib.h,v 1.131 2016/12/06 14:54:31 roberto Exp $
** $Id: lauxlib.h,v 1.131.1.1 2017/04/19 17:20:42 roberto Exp $
** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h
*/
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lfunc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lfunc.h,v 2.15 2015/01/13 15:49:11 roberto Exp $
** $Id: lfunc.h,v 2.15.1.1 2017/04/19 17:39:34 roberto Exp $
** Auxiliary functions to manipulate prototypes and closures
** See Copyright Notice in lua.h
*/
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/llimits.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: llimits.h,v 1.141 2015/11/19 19:16:22 roberto Exp $
** $Id: llimits.h,v 1.141.1.1 2017/04/19 17:20:42 roberto Exp $
** Limits, basic types, and some other 'installation-dependent' definitions
** See Copyright Notice in lua.h
*/
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lmem.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lmem.h,v 1.43 2014/12/19 17:26:14 roberto Exp $
** $Id: lmem.h,v 1.43.1.1 2017/04/19 17:20:42 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lobject.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lobject.h,v 2.117 2016/08/01 19:51:24 roberto Exp $
** $Id: lobject.h,v 2.117.1.1 2017/04/19 17:39:34 roberto Exp $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
Expand Down
20 changes: 19 additions & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lstate.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lstate.h,v 2.133 2016/12/22 13:08:50 roberto Exp $
** $Id: lstate.h,v 2.133.1.1 2017/04/19 17:39:34 roberto Exp $
** Global State
** See Copyright Notice in lua.h
*/
Expand All @@ -26,6 +26,24 @@
** 'tobefnz': all objects ready to be finalized;
** 'fixedgc': all objects that are not to be collected (currently
** only small strings, such as reserved words).
**
** Moreover, there is another set of lists that control gray objects.
** These lists are linked by fields 'gclist'. (All objects that
** can become gray have such a field. The field is not the same
** in all objects, but it always has this name.) Any gray object
** must belong to one of these lists, and all objects in these lists
** must be gray:
**
** 'gray': regular gray objects, still waiting to be visited.
** 'grayagain': objects that must be revisited at the atomic phase.
** That includes
** - black objects got in a write barrier;
** - all kinds of weak tables during propagation phase;
** - all threads.
** 'weak': tables with weak values to be cleared;
** 'ephemeron': ephemeron tables with white->white entries;
** 'allweak': tables with weak keys and/or weak values to be cleared.
** The last three lists are used only during the atomic phase.

*/

Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/ltm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: ltm.h,v 2.22 2016/02/26 19:20:15 roberto Exp $
** $Id: ltm.h,v 2.22.1.1 2017/04/19 17:20:42 roberto Exp $
** Tag methods
** See Copyright Notice in lua.h
*/
Expand Down
7 changes: 3 additions & 4 deletions Plugins/UnLua/Source/ThirdParty/Lua/include/lua.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
** $Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp $
** Lua - A Scripting Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
Expand All @@ -19,11 +18,11 @@
#define LUA_VERSION_MAJOR "5"
#define LUA_VERSION_MINOR "3"
#define LUA_VERSION_NUM 503
#define LUA_VERSION_RELEASE "4"
#define LUA_VERSION_RELEASE "6"

#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2017 Lua.org, PUC-Rio"
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2020 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"


Expand Down Expand Up @@ -460,7 +459,7 @@ struct lua_Debug {


/******************************************************************************
* Copyright (C) 1994-2017 Lua.org, PUC-Rio.
* Copyright (C) 1994-2020 Lua.org, PUC-Rio.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
Expand Down
9 changes: 8 additions & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/luaconf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $
** $Id: luaconf.h,v 1.259.1.1 2017/04/19 17:29:57 roberto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
Expand Down Expand Up @@ -620,6 +620,13 @@
#endif


/*
@@ lua_pointer2str converts a pointer to a readable string in a
** non-specified way.
*/
#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p)


/*
@@ lua_number2strx converts a float to an hexadecimal numeric string.
** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lualib.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lualib.h,v 1.45 2017/01/12 17:14:26 roberto Exp $
** $Id: lualib.h,v 1.45.1.1 2017/04/19 17:20:42 roberto Exp $
** Lua standard libraries
** See Copyright Notice in lua.h
*/
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/include/lzio.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** $Id: lzio.h,v 1.31 2015/09/08 15:41:05 roberto Exp $
** $Id: lzio.h,v 1.31.1.1 2017/04/19 17:20:42 roberto Exp $
** Buffered streams
** See Copyright Notice in lua.h
*/
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/lib/Mac/liblua.a
Binary file not shown.
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/lib/Win64/Lua.lib
Binary file not shown.
Binary file modified Plugins/UnLua/Source/ThirdParty/Lua/lib/iOS/liblua.a
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins/UnLua/UnLua.uplugin
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Name" : "UnLua",
"Type" : "Runtime",
"LoadingPhase" : "PostConfigInit",
"WhitelistPlatforms" : [ "Win64", "Mac", "IOS", "Android" ]
"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Android", "Linux"]
},
{
"Name" : "UnLuaEditor",
Expand Down