From cc7094c76e89696fcef7afe98fabfbab3cb3c2a3 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Fri, 26 Feb 2016 00:09:49 -0800 Subject: [PATCH 1/2] build: add local.properties file as a target --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6d8cc2849..ab53a0595 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ -apk: + +apk: local.properties git submodule init git submodule sync git submodule update - android update project --path . ./mk-luajit.sh armeabi-v7a ndk-build ant debug +local.properties: + android update project --path . + dev: apk ant dev From 435277e4cafe8cb918556b307d1ae86cfab280cd Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Fri, 26 Feb 2016 00:10:20 -0800 Subject: [PATCH 2/2] fix: print load error message properly --- assets/dl.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/dl.lua b/assets/dl.lua index 44111c8f8..b664d2a5e 100644 --- a/assets/dl.lua +++ b/assets/dl.lua @@ -33,9 +33,9 @@ local dl = { local function sys_dlopen(library) local p = ffi.C.dlopen(library, ffi.C.RTLD_LOCAL) if p == nil then - local error = ffi.C.dlerror() - if error ~= nil then - error("error opening "..library..": "..ffi.string(error)) + local err_msg = ffi.C.dlerror() + if err_msg ~= nil then + error("error opening "..library..": "..ffi.string(err_msg)) end end return p