source:
code/branches/map/src/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff
@
3050
Last change on this file since 3050 was 2710, checked in by rgrieder, 16 years ago | |
---|---|
|
|
File size: 2.5 KB |
-
CEGUILua.cpp
27 27 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 28 28 * OTHER DEALINGS IN THE SOFTWARE. 29 29 ***************************************************************************/ 30 #ifdef HAVE_CONFIG_H31 # include "config.h"32 #endif33 34 30 #include "CEGUI.h" 35 31 #include "CEGUIConfig.h" 36 32 #include "CEGUIPropertyHelper.h" … … 45 41 #include "lauxlib.h" 46 42 } 47 43 48 #include "tolua ++.h"44 #include "tolua/tolua++.h" 49 45 50 46 // prototype for bindings initialisation function 51 47 int tolua_CEGUI_open(lua_State* tolua_S); … … 61 57 LuaScriptModule::LuaScriptModule() : 62 58 d_errFuncIndex(LUA_NOREF) 63 59 { 64 #if CEGUI_LUA_VER >= 5160 #if LUA_VERSION_NUM >= 501 65 61 static const luaL_Reg lualibs[] = { 66 62 {"", luaopen_base}, 67 63 {LUA_LOADLIBNAME, luaopen_package}, … … 75 71 #endif 76 72 {0, 0} 77 73 }; 78 #endif /* CEGUI_LUA_VER >= 51 */74 #endif /* LUA_VERSION_NUM >= 501 */ 79 75 80 76 // create a lua state 81 77 d_ownsState = true; 82 78 d_state = lua_open(); 83 79 84 80 // init all standard libraries 85 #if CEGUI_LUA_VER >= 5181 #if LUA_VERSION_NUM >= 501 86 82 const luaL_Reg *lib = lualibs; 87 83 for (; lib->func; lib++) 88 84 { … … 90 86 lua_pushstring(d_state, lib->name); 91 87 lua_call(d_state, 1, 0); 92 88 } 93 #else /* CEGUI_LUA_VER >= 51 */89 #else /* LUA_VERSION_NUM >= 501 */ 94 90 luaopen_base(d_state); 95 91 luaopen_io(d_state); 96 92 luaopen_string(d_state); … … 99 95 #if defined(DEBUG) || defined (_DEBUG) 100 96 luaopen_debug(d_state); 101 97 #endif 102 #endif /* CEGUI_LUA_VER >= 51 */98 #endif /* LUA_VERSION_NUM >= 501 */ 103 99 104 100 setModuleIdentifierString(); 105 101 } -
CEGUILua.h
38 38 # ifdef CEGUILUA_EXPORTS 39 39 # define CEGUILUA_API __declspec(dllexport) 40 40 # 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 42 46 # endif 43 47 #else 44 48 # define CEGUILUA_API -
CEGUILuaFunctor.cpp
40 40 #include "lauxlib.h" 41 41 } 42 42 43 #include "tolua ++.h"43 #include "tolua/tolua++.h" 44 44 45 45 // Start of CEGUI namespace section 46 46 namespace CEGUI
Note: See TracBrowser
for help on using the repository browser.