| 1 |
diff -up ClanLib-0.6.5/Sources/API/Lua/lua.h.bar ClanLib-0.6.5/Sources/API/Lua/lua.h
|
| 2 |
--- ClanLib-0.6.5/Sources/API/Lua/lua.h.bar 2001-09-22 17:52:16.000000000 +0200
|
| 3 |
+++ ClanLib-0.6.5/Sources/API/Lua/lua.h 2008-09-07 13:42:06.000000000 +0200
|
| 4 |
@@ -47,9 +47,9 @@ public:
|
| 5 |
//: Init
|
| 6 |
static void init()
|
| 7 |
{
|
| 8 |
- state=lua_open(0);
|
| 9 |
+ state=lua_open();
|
| 10 |
tolua_clanbindings_open(state);
|
| 11 |
- lua_baselibopen(state);
|
| 12 |
+ luaopen_base(state);
|
| 13 |
initialized=true;
|
| 14 |
}
|
| 15 |
|
| 16 |
@@ -65,32 +65,32 @@ public:
|
| 17 |
static int dofile (char *filename)
|
| 18 |
{
|
| 19 |
cl_assert(initialized);
|
| 20 |
- return lua_dofile(state,filename);
|
| 21 |
+ return luaL_dofile(state,filename);
|
| 22 |
}
|
| 23 |
|
| 24 |
|
| 25 |
//: Open the IO library
|
| 26 |
- static void iolibopen(void) { lua_iolibopen(state); }
|
| 27 |
+ static void iolibopen(void) { luaopen_io(state); }
|
| 28 |
|
| 29 |
//: Open the string library
|
| 30 |
static void strlibopen(void)
|
| 31 |
{
|
| 32 |
cl_assert(initialized);
|
| 33 |
- lua_strlibopen(state);
|
| 34 |
+ luaopen_string(state);
|
| 35 |
}
|
| 36 |
|
| 37 |
//: Open the math library
|
| 38 |
static void mathlibopen(void)
|
| 39 |
{
|
| 40 |
cl_assert(initialized);
|
| 41 |
- lua_mathlibopen(state);
|
| 42 |
+ luaopen_math(state);
|
| 43 |
}
|
| 44 |
|
| 45 |
//: Open the db library
|
| 46 |
static void dblibopen(void)
|
| 47 |
{
|
| 48 |
cl_assert(initialized);
|
| 49 |
- lua_dblibopen(state);
|
| 50 |
+ luaopen_debug(state);
|
| 51 |
}
|
| 52 |
};
|
| 53 |
#endif
|
| 54 |
diff -up ClanLib-0.6.5/configure.in.bar ClanLib-0.6.5/configure.in
|
| 55 |
--- ClanLib-0.6.5/configure.in.bar 2008-09-07 13:39:37.000000000 +0200
|
| 56 |
+++ ClanLib-0.6.5/configure.in 2008-09-07 13:42:06.000000000 +0200
|
| 57 |
@@ -219,10 +219,8 @@ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPE
|
| 58 |
CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
|
| 59 |
CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
|
| 60 |
CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
|
| 61 |
-for lib in lua40 lua; do
|
| 62 |
- dnl setting back OLDLIBS is needed because of the break
|
| 63 |
- CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
|
| 64 |
-done
|
| 65 |
+dnl hack force lua
|
| 66 |
+lua=enabled
|
| 67 |
CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
|
| 68 |
for lib in Xxf86vm_pic Xxf86vm; do
|
| 69 |
dnl setting back OLDLIBS is needed because of the break
|
Parent Directory
| 
Revision Log