Backout changeset 57172a7f03452a6b07f346e850f3e1020e230f46

This commit is contained in:
Alex Szpakowski
2014-06-05 14:59:29 -03:00
parent e9e303c1e8
commit 3792dee4b4
7 changed files with 5520 additions and 29 deletions
@@ -26,6 +26,7 @@
#include "font/Rasterizer.h"
#include "filesystem/wrap_Filesystem.h"
#include "scripts/graphics.lua.h"
#include <cassert>
namespace love
@@ -1503,11 +1504,6 @@ static const lua_CFunction types[] =
0
};
// Scripts.
static const char graphics_lua[] =
#include "scripts/graphics.lua"
;
extern "C" int luaopen_love_graphics(lua_State *L)
{
if (instance == 0)
@@ -1526,7 +1522,7 @@ extern "C" int luaopen_love_graphics(lua_State *L)
int n = luax_register_module(L, w);
if (luaL_loadbuffer(L, graphics_lua, sizeof(graphics_lua), "graphics.lua") == 0)
if (luaL_loadbuffer(L, (const char *)graphics_lua, sizeof(graphics_lua), "graphics.lua") == 0)
lua_call(L, 0, 0);
return n;
+4 -6
View File
@@ -44,6 +44,9 @@
# include "libraries/enet/lua-enet.h"
#endif
// Scripts
#include "scripts/boot.lua.h"
// All modules define a c-accessible luaopen
// so let's make use of those, instead
// of addressing implementations directly.
@@ -283,14 +286,9 @@ int w__openConsole(lua_State *L)
#endif // LOVE_LEGENDARY_CONSOLE_IO_HACK
// Scripts.
static const char boot_lua[] =
#include "scripts/boot.lua"
;
int luaopen_love_boot(lua_State *L)
{
if (luaL_loadbuffer(L, boot_lua, sizeof(boot_lua), "boot.lua") == 0)
if (luaL_loadbuffer(L, (const char *)love::boot_lua, sizeof(love::boot_lua), "boot.lua") == 0)
lua_call(L, 0, 1);
return 1;