Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/ceguilua/ceguilua-0.5.0/ceguilua/changes_orxonox.diff @ 2710

Last change on this file since 2710 was 2710, checked in by rgrieder, 15 years ago

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.
  • Property svn:eol-style set to native
File size: 2.9 KB

  • CEGUILua.cpp

     
    4040#include "lauxlib.h"
    4141}
    4242
    43 #include "tolua++.h"
     43#include "tolua/tolua++.h"
    4444
    4545// prototype for bindings initialisation function
    4646int tolua_CEGUI_open(lua_State* tolua_S);
    … …  
    5555*************************************************************************/
    5656LuaScriptModule::LuaScriptModule()
    5757{
     58    #if LUA_VERSION_NUM >= 501
     59        static const luaL_Reg lualibs[] = {
     60            {"", luaopen_base},
     61            {LUA_LOADLIBNAME, luaopen_package},
     62            {LUA_TABLIBNAME, luaopen_table},
     63            {LUA_IOLIBNAME, luaopen_io},
     64            {LUA_OSLIBNAME, luaopen_os},
     65            {LUA_STRLIBNAME, luaopen_string},
     66            {LUA_MATHLIBNAME, luaopen_math},
     67        #if defined(DEBUG) || defined (_DEBUG)
     68                {LUA_DBLIBNAME, luaopen_debug},
     69        #endif
     70            {0, 0}
     71        };
     72    #endif /* LUA_VERSION_NUM >= 501 */
     73
    5874        // create a lua state
    5975        d_ownsState = true;
    6076        d_state = lua_open();
    6177
    6278        // init all standard libraries
    63         luaopen_base(d_state);
    64         luaopen_io(d_state);
    65         luaopen_string(d_state);
    66         luaopen_table(d_state);
    67         luaopen_math(d_state);
    68 #if defined(DEBUG) || defined (_DEBUG)
    69         luaopen_debug(d_state);
    70 #endif
     79    #if LUA_VERSION_NUM >= 501
     80            const luaL_Reg *lib = lualibs;
     81            for (; lib->func; lib++)
     82            {
     83                lua_pushcfunction(d_state, lib->func);
     84                lua_pushstring(d_state, lib->name);
     85                lua_call(d_state, 1, 0);
     86            }
     87    #else /* LUA_VERSION_NUM >= 501 */
     88            luaopen_base(d_state);
     89            luaopen_io(d_state);
     90            luaopen_string(d_state);
     91            luaopen_table(d_state);
     92            luaopen_math(d_state);
     93        #if defined(DEBUG) || defined (_DEBUG)
     94                luaopen_debug(d_state);
     95        #endif
     96    #endif /* LUA_VERSION_NUM >= 501 */
    7197
    7298        setModuleIdentifierString();
    7399}

  • CEGUILua.h

     
    3838#   ifdef CEGUILUA_EXPORTS
    3939#       define CEGUILUA_API __declspec(dllexport)
    4040#   else
    41 #       define CEGUILUA_API __declspec(dllimport)
     41#       if defined( __MINGW32__ )
     42#           define CEGUILUA_API
     43#       else
     44#           define CEGUILUA_API __declspec(dllimport)
     45#       endif
    4246#   endif
    4347#else
    4448#   define CEGUILUA_API

  • CEGUILuaFunctor.cpp

     
    3939#include "lauxlib.h"
    4040}
    4141
    42 #include "tolua++.h"
     42#include "tolua/tolua++.h"
    4343
    4444// Start of CEGUI namespace section
    4545namespace CEGUI

  • required.h

     
    3636#define __operator_decrement    operator--
    3737#define __operator_dereference  operator*
    3838
     39//This is used to keep compilers happy
     40#define CEGUIDeadException(e) &
     41
    3942#define LuaFunctorSubscribeEvent CEGUI::LuaFunctor::SubscribeEvent
    4043
    4144#if defined(_MSC_VER) && !defined(snprintf)
Note: See TracBrowser for help on using the repository browser.