LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 11:44:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make love compile against lua5.2

Browse Source
This commit is contained in:
Bart van Strien
2013-07-10 16:02:52 +02:00
parent 14ca401158
commit f5603b0291
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ int w_newGeometry(lua_State *L)
vertex v;
lua_rawgeti(L, 1, i+1);
if (!lua_istable(L, -1))
return luaL_typerror(L, 1, "table of tables");
return luax_typerror(L, 1, "table of tables");
for (int j = 1; j <= 8; j++)
lua_rawgeti(L, -j, j);
src/modules/graphics/opengl/wrap_Shader.cpp
+6 -6
View File
@@ -58,7 +58,7 @@ static T *_getScalars(lua_State *L, int count, size_t &dimension)
else
{
delete[] values;
luaL_typerror(L, 3 + i, "number or boolean");
luax_typerror(L, 3 + i, "number or boolean");
return 0;
}
}
@@ -77,7 +77,7 @@ static T *_getVectors(lua_State *L, int count, size_t &dimension)
if (!lua_istable(L, 3 + i))
{
delete[] values;
luaL_typerror(L, 3 + i, "table");
luax_typerror(L, 3 + i, "table");
return 0;
}
if (lua_objlen(L, 3 + i) != dimension)
@@ -98,7 +98,7 @@ static T *_getVectors(lua_State *L, int count, size_t &dimension)
else
{
delete[] values;
luaL_typerror(L, -1, "number or boolean");
luax_typerror(L, -1, "number or boolean");
return 0;
}
}
@@ -125,7 +125,7 @@ int w_Shader_sendInt(lua_State *L)
else if (lua_istable(L, 3))
values = _getVectors<int>(L, count, dimension);
else
return luaL_typerror(L, 3, "number, boolean, or table");
return luax_typerror(L, 3, "number, boolean, or table");
if (!values)
return luaL_error(L, "Error in arguments.");
@@ -162,7 +162,7 @@ int w_Shader_sendFloat(lua_State *L)
else if (lua_istable(L, 3))
values = _getVectors<float>(L, count, dimension);
else
return luaL_typerror(L, 3, "number, boolean, or table");
return luax_typerror(L, 3, "number, boolean, or table");
if (!values)
return luaL_error(L, "Error in arguments.");
@@ -189,7 +189,7 @@ int w_Shader_sendMatrix(lua_State *L)
const char *name = luaL_checkstring(L, 2);
if (!lua_istable(L, 3))
return luaL_typerror(L, 3, "matrix table");
return luax_typerror(L, 3, "matrix table");
lua_getfield(L, 3, "dimension");
int dimension = lua_tointeger(L, -1);
src/modules/thread/LuaThread.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ LuaThread::~LuaThread()
void LuaThread::threadFunction()
{
this->retain();
lua_State * L = lua_open();
lua_State *L = luaL_newstate();
luaL_openlibs(L);
#ifdef LOVE_BUILD_STANDALONE
love::luax_preload(L, luaopen_love, "love");