izaya/LuPPC
1
0
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

several more fixes #2

Open
Ocawesome101 wants to merge 19 commits from Ocawesome101/LuPPC:master into master
pull from: Ocawesome101/LuPPC:master
merge into: izaya:master
Conversation 2 Commits 19 Files Changed 7 +7 -2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cb94c6a6c - Show all commits

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/usereeprom.lua /usereeprom.lua
/run /run
/root* /root*
/musl-cross-make

6
scripts/dependencies.sh
View File

@ -42,6 +42,10 @@ case "$1" in
TOOL=powerpc-linux-musl TOOL=powerpc-linux-musl
OUT=$TOOL OUT=$TOOL
;; ;;
i686 )
TOOL=i686-linux-musl
OUT=i686-linux-musl
;;
*) echo "Invalid target!" ; exit 1 *) echo "Invalid target!" ; exit 1
;; ;;
esac esac
@ -60,7 +64,7 @@ cd dependencies
if [ $2 = "libressl" ] || [ $# -lt 2 ]; then if [ $2 = "libressl" ] || [ $# -lt 2 ]; then
git clone https://github.com/libressl-portable/portable.git libressl git clone --depth 1 https://github.com/libressl-portable/portable.git libressl
cd libressl cd libressl
./autogen.sh ./autogen.sh
CFLAGS="-fdata-sections -ffunction-sections" ./configure --host=$TOOL CFLAGS="-fdata-sections -ffunction-sections" ./configure --host=$TOOL

2
src/lua/core/component.lua
View File

@ -50,7 +50,7 @@ function api.register(address, ctype, proxy, doc)
end end
components[address] = {address = address, type = ctype, doc = doc or {}} components[address] = {address = address, type = ctype, doc = doc or {}}
components[address].rawproxy = proxy components[address].rawproxy = proxy
components[address].proxy = {} components[address].proxy = {address = address, type = ctype, slot = -1}
for k,v in pairs(proxy) do for k,v in pairs(proxy) do
if type(v) == "function" then if type(v) == "function" then
components[address].proxy[k] = setmetatable({name=k,address=address}, componentCallback) components[address].proxy[k] = setmetatable({name=k,address=address}, componentCallback)