|
 |
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Lua/lua.h.bar ClanLib-0.6.5/Sources/API/Lua/lua.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Lua/lua.h.bar 2001-09-22 17:52:16.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Lua/lua.h 2008-09-07 13:42:06.000000000 +0200
|
|
|
87bfab1 |
@@ -47,9 +47,9 @@ public:
|
|
|
753c03c |
//: Init
|
|
|
753c03c |
static void init()
|
|
|
753c03c |
{
|
|
|
753c03c |
- state=lua_open(0);
|
|
|
753c03c |
+ state=lua_open();
|
|
|
753c03c |
tolua_clanbindings_open(state);
|
|
|
753c03c |
- lua_baselibopen(state);
|
|
|
753c03c |
+ luaopen_base(state);
|
|
|
753c03c |
initialized=true;
|
|
|
753c03c |
}
|
|
|
753c03c |
|
|
|
87bfab1 |
@@ -65,32 +65,32 @@ public:
|
|
|
753c03c |
static int dofile (char *filename)
|
|
|
753c03c |
{
|
|
|
753c03c |
cl_assert(initialized);
|
|
|
753c03c |
- return lua_dofile(state,filename);
|
|
|
753c03c |
+ return luaL_dofile(state,filename);
|
|
|
753c03c |
}
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
753c03c |
//: Open the IO library
|
|
|
753c03c |
- static void iolibopen(void) { lua_iolibopen(state); }
|
|
|
753c03c |
+ static void iolibopen(void) { luaopen_io(state); }
|
|
|
753c03c |
|
|
|
753c03c |
//: Open the string library
|
|
|
753c03c |
static void strlibopen(void)
|
|
|
753c03c |
{
|
|
|
753c03c |
cl_assert(initialized);
|
|
|
753c03c |
- lua_strlibopen(state);
|
|
|
753c03c |
+ luaopen_string(state);
|
|
|
753c03c |
}
|
|
|
753c03c |
|
|
|
753c03c |
//: Open the math library
|
|
|
753c03c |
static void mathlibopen(void)
|
|
|
753c03c |
{
|
|
|
753c03c |
cl_assert(initialized);
|
|
|
753c03c |
- lua_mathlibopen(state);
|
|
|
753c03c |
+ luaopen_math(state);
|
|
|
753c03c |
}
|
|
|
753c03c |
|
|
|
753c03c |
//: Open the db library
|
|
|
753c03c |
static void dblibopen(void)
|
|
|
753c03c |
{
|
|
|
753c03c |
cl_assert(initialized);
|
|
|
753c03c |
- lua_dblibopen(state);
|
|
|
753c03c |
+ luaopen_debug(state);
|
|
|
753c03c |
}
|
|
|
753c03c |
};
|
|
|
753c03c |
#endif
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/configure.in.bar ClanLib-0.6.5/configure.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/configure.in.bar 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/configure.in 2008-09-07 13:42:06.000000000 +0200
|
|
|
87bfab1 |
@@ -219,10 +219,8 @@ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPE
|
|
|
87bfab1 |
CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
|
|
|
87bfab1 |
CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
|
|
|
87bfab1 |
CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
|
|
|
87bfab1 |
-for lib in lua40 lua; do
|
|
|
87bfab1 |
- dnl setting back OLDLIBS is needed because of the break
|
|
|
87bfab1 |
- CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
|
|
|
87bfab1 |
-done
|
|
|
87bfab1 |
+dnl hack force lua
|
|
|
87bfab1 |
+lua=enabled
|
|
|
87bfab1 |
CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
|
|
|
87bfab1 |
for lib in Xxf86vm_pic Xxf86vm; do
|
|
|
87bfab1 |
dnl setting back OLDLIBS is needed because of the break
|