source:
code/branches/buildsystem3/src/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff
@
2664
Last change on this file since 2664 was 2664, checked in by rgrieder, 15 years ago | |
---|---|
File size: 2.6 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 "CEGUIPropertyHelper.h" 36 32 #include "CEGUILua.h" … … 44 40 #include "lauxlib.h" 45 41 } 46 42 47 #include "tolua ++.h"43 #include "tolua/tolua++.h" 48 44 49 45 // prototype for bindings initialisation function 50 46 int tolua_CEGUI_open(lua_State* tolua_S); … … 59 55 *************************************************************************/ 60 56 LuaScriptModule::LuaScriptModule() 61 57 { 62 #if CEGUI_LUA_VER >= 5158 #if LUA_VERSION_NUM >= 501 63 59 static const luaL_Reg lualibs[] = { 64 60 {"", luaopen_base}, 65 61 {LUA_LOADLIBNAME, luaopen_package}, … … 73 69 #endif 74 70 {0, 0} 75 71 }; 76 #endif /* CEGUI_LUA_VER >= 51 */72 #endif /* LUA_VERSION_NUM >= 501 */ 77 73 78 74 // create a lua state 79 75 d_ownsState = true; 80 76 d_state = lua_open(); 81 77 82 78 // init all standard libraries 83 #if CEGUI_LUA_VER >= 5179 #if LUA_VERSION_NUM >= 501 84 80 const luaL_Reg *lib = lualibs; 85 81 for (; lib->func; lib++) 86 82 { … … 88 84 lua_pushstring(d_state, lib->name); 89 85 lua_call(d_state, 1, 0); 90 86 } 91 #else /* CEGUI_LUA_VER >= 51 */87 #else /* LUA_VERSION_NUM >= 501 */ 92 88 luaopen_base(d_state); 93 89 luaopen_io(d_state); 94 90 luaopen_string(d_state); … … 97 93 #if defined(DEBUG) || defined (_DEBUG) 98 94 luaopen_debug(d_state); 99 95 #endif 100 #endif /* CEGUI_LUA_VER >= 51 */96 #endif /* LUA_VERSION_NUM >= 501 */ 101 97 102 98 setModuleIdentifierString(); 103 99 } -
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
39 39 #include "lauxlib.h" 40 40 } 41 41 42 #include "tolua ++.h"42 #include "tolua/tolua++.h" 43 43 44 44 // Start of CEGUI namespace section 45 45 namespace CEGUI
Note: See TracBrowser
for help on using the repository browser.