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