Merge with latest development
This commit is contained in:
commit
a972ab8009
@ -145,7 +145,7 @@
|
||||
local i = 0
|
||||
return function()
|
||||
i = i + 1
|
||||
return act._list[keys[i]]
|
||||
return action._list[keys[i]]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -75,6 +75,12 @@ LUALIB_API int luaL_loadfile (lua_State* L, const char* filename)
|
||||
if (z == OKAY) {
|
||||
lua_pushcclosure(L, chunk_wrapper, 2);
|
||||
}
|
||||
else {
|
||||
lua_pushstring(L, "cannot open ");
|
||||
lua_pushstring(L, filename);
|
||||
lua_pushstring(L, ": No such file or directory");
|
||||
lua_concat(L, 3);
|
||||
}
|
||||
|
||||
return z;
|
||||
}
|
||||
|
@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
cd `dirname $0` && ../bin/debug/premake5 /file=../premake5.lua /scripts=../src $1 $2 $3 test
|
||||
cd `dirname $0` && ../bin/debug/premake5 /file=../premake5.lua /scripts=.. $1 $2 $3 test
|
||||
|
@ -1,4 +1,4 @@
|
||||
@echo off
|
||||
pushd "%~dp0"
|
||||
..\bin\debug\premake5.exe /scripts=..\src /file=..\premake5.lua %* test
|
||||
..\bin\debug\premake5.exe /scripts=.. /file=..\premake5.lua %* test
|
||||
popd
|
||||
|
Reference in New Issue
Block a user