[2608] | 1 | --- CEGUILua.cpp Sun Jan 25 18:32:57 2009 |
---|
| 2 | +++ CEGUILua.cpp Thu Jan 29 10:24:44 2009 |
---|
| 3 | @@ -27,10 +27,6 @@ |
---|
[2705] | 4 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
---|
| 5 | * OTHER DEALINGS IN THE SOFTWARE. |
---|
| 6 | ***************************************************************************/ |
---|
| 7 | -#ifdef HAVE_CONFIG_H |
---|
| 8 | -# include "config.h" |
---|
| 9 | -#endif |
---|
| 10 | - |
---|
| 11 | #include "CEGUI.h" |
---|
| 12 | #include "CEGUIConfig.h" |
---|
| 13 | #include "CEGUIPropertyHelper.h" |
---|
[2608] | 14 | @@ -45,7 +41,7 @@ |
---|
[2705] | 15 | #include "lauxlib.h" |
---|
| 16 | } |
---|
| 17 | |
---|
| 18 | -#include "tolua++.h" |
---|
| 19 | +#include "tolua/tolua++.h" |
---|
| 20 | |
---|
| 21 | // prototype for bindings initialisation function |
---|
| 22 | int tolua_CEGUI_open(lua_State* tolua_S); |
---|
[2608] | 23 | @@ -61,7 +57,7 @@ |
---|
[2705] | 24 | LuaScriptModule::LuaScriptModule() : |
---|
| 25 | d_errFuncIndex(LUA_NOREF) |
---|
| 26 | { |
---|
| 27 | - #if CEGUI_LUA_VER >= 51 |
---|
| 28 | + #if LUA_VERSION_NUM >= 501 |
---|
| 29 | static const luaL_Reg lualibs[] = { |
---|
| 30 | {"", luaopen_base}, |
---|
| 31 | {LUA_LOADLIBNAME, luaopen_package}, |
---|
[2608] | 32 | @@ -75,14 +71,14 @@ |
---|
[2705] | 33 | #endif |
---|
| 34 | {0, 0} |
---|
| 35 | }; |
---|
| 36 | - #endif /* CEGUI_LUA_VER >= 51 */ |
---|
| 37 | + #endif /* LUA_VERSION_NUM >= 501 */ |
---|
| 38 | |
---|
| 39 | // create a lua state |
---|
| 40 | d_ownsState = true; |
---|
| 41 | d_state = lua_open(); |
---|
| 42 | |
---|
| 43 | // init all standard libraries |
---|
| 44 | - #if CEGUI_LUA_VER >= 51 |
---|
| 45 | + #if LUA_VERSION_NUM >= 501 |
---|
| 46 | const luaL_Reg *lib = lualibs; |
---|
| 47 | for (; lib->func; lib++) |
---|
| 48 | { |
---|
[2608] | 49 | @@ -90,7 +86,7 @@ |
---|
[2705] | 50 | lua_pushstring(d_state, lib->name); |
---|
| 51 | lua_call(d_state, 1, 0); |
---|
| 52 | } |
---|
| 53 | - #else /* CEGUI_LUA_VER >= 51 */ |
---|
| 54 | + #else /* LUA_VERSION_NUM >= 501 */ |
---|
| 55 | luaopen_base(d_state); |
---|
| 56 | luaopen_io(d_state); |
---|
| 57 | luaopen_string(d_state); |
---|
[2608] | 58 | @@ -99,7 +95,7 @@ |
---|
[2705] | 59 | #if defined(DEBUG) || defined (_DEBUG) |
---|
| 60 | luaopen_debug(d_state); |
---|
| 61 | #endif |
---|
| 62 | - #endif /* CEGUI_LUA_VER >= 51 */ |
---|
| 63 | + #endif /* LUA_VERSION_NUM >= 501 */ |
---|
| 64 | |
---|
| 65 | setModuleIdentifierString(); |
---|
| 66 | } |
---|
[2608] | 67 | --- CEGUILua.h Sun Jan 25 18:32:57 2009 |
---|
| 68 | +++ CEGUILua.h Thu Jan 29 10:17:42 2009 |
---|
| 69 | @@ -38,7 +38,11 @@ |
---|
[2705] | 70 | # ifdef CEGUILUA_EXPORTS |
---|
| 71 | # define CEGUILUA_API __declspec(dllexport) |
---|
| 72 | # else |
---|
| 73 | -# define CEGUILUA_API __declspec(dllimport) |
---|
| 74 | +# if defined( __MINGW32__ ) |
---|
| 75 | +# define CEGUILUA_API |
---|
| 76 | +# else |
---|
| 77 | +# define CEGUILUA_API __declspec(dllimport) |
---|
| 78 | +# endif |
---|
| 79 | # endif |
---|
| 80 | #else |
---|
| 81 | # define CEGUILUA_API |
---|
[2608] | 82 | --- CEGUILuaFunctor.cpp Sun Jan 25 18:32:57 2009 |
---|
| 83 | +++ CEGUILuaFunctor.cpp Thu Jan 29 10:25:48 2009 |
---|
| 84 | @@ -40,7 +40,7 @@ |
---|
[2705] | 85 | #include "lauxlib.h" |
---|
| 86 | } |
---|
| 87 | |
---|
| 88 | -#include "tolua++.h" |
---|
| 89 | +#include "tolua/tolua++.h" |
---|
| 90 | |
---|
| 91 | // Start of CEGUI namespace section |
---|
| 92 | namespace CEGUI |
---|