Skip to content

Commit 189eb8f

Browse files
committed
[update] add lua5.1.4 and lua5.3.4 to coexist. | 添加lua5.1.4和lua5.3.4共存.
1 parent 71554e7 commit 189eb8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+26962
-2199
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Build Status](https://travis-ci.org/liu2guang/lua2rtt.svg?branch=master)](https://travis-ci.org/liu2guang/lua2rtt)
44
[![release](https://img.shields.io/badge/Release-v0.0.1-orange.svg)](https://github.com/liu2guang/LittlevGL2RTT/releases)
55

6-
lua2rtt 是在RTThread3.0版本移植的elua5.1.4版本, 目的是无缝嵌入RTT, 无需开发者去移植. 如果您觉得该库看得顺眼舒服,请捐赠颗小星星. 小星星就是更新的动力!!!
6+
lua2rtt是在RTThread3.0版本移植的lua仓库, 目的是无缝嵌入RTT, 无需开发者去移植. 如果您觉得该库看得顺眼舒服,请捐赠颗小星星. 小星星就是更新的动力!!!
77

88
已测试跑通的bsp有以下:
99
1. RT1050

SConscript

+8-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,22 @@ cwd = GetCurrentDir()
88
src = []
99
inc = []
1010

11-
# add lua2rtt common include
11+
# add lua common include
1212
inc = inc + [cwd]
1313

14-
# add lua2rtt basic code
14+
# add lua basic code
1515
src = src + ['./lua2rtt.c']
1616

1717
# add group to IDE project
18-
objs = DefineGroup('lua2rtt', src, depend = ['PKG_USING_LUA2RTT'], CPPPATH = inc)
18+
if GetDepend('LUA_USING_PORTING_V514'):
19+
objs = DefineGroup('lua-5.1.4', src, depend = ['PKG_USING_LUA', 'LUA_USING_PORTING_V514'], CPPPATH = inc)
20+
21+
if GetDepend('LUA_USING_PORTING_V534'):
22+
objs = DefineGroup('lua-5.3.4', src, depend = ['PKG_USING_LUA', 'LUA_USING_PORTING_V534'], CPPPATH = inc)
1923

2024
# traversal subscript
2125
list = os.listdir(cwd)
22-
if GetDepend('PKG_USING_LUA2RTT'):
26+
if GetDepend('PKG_USING_LUA'):
2327
for d in list:
2428
path = os.path.join(cwd, d)
2529
if os.path.isfile(os.path.join(path, 'SConscript')):

buglist.md

-22
This file was deleted.

lexlibs/SConscript

-16
This file was deleted.

lexlibs/lua_cjson/README.md

-49
This file was deleted.

lexlibs/lua_cjson/SConscript

-20
This file was deleted.

0 commit comments

Comments
 (0)