source:
code/branches/buildsystem3/src/ceguilua/ceguilua-0.6.1/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.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 -
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); … … 60 56 *************************************************************************/ 61 57 LuaScriptModule::LuaScriptModule() 62 58 { 63 #if CEGUI_LUA_VER >= 5159 #if LUA_VERSION_NUM >= 501 64 60 static const luaL_Reg lualibs[] = { 65 61 {"", luaopen_base}, 66 62 {LUA_LOADLIBNAME, luaopen_package}, … … 74 70 #endif 75 71 {0, 0} 76 72 }; 77 #endif /* CEGUI_LUA_VER >= 51 */73 #endif /* LUA_VERSION_NUM >= 501 */ 78 74 79 75 // create a lua state 80 76 d_ownsState = true; 81 77 d_state = lua_open(); 82 78 83 79 // init all standard libraries 84 #if CEGUI_LUA_VER >= 5180 #if LUA_VERSION_NUM >= 501 85 81 const luaL_Reg *lib = lualibs; 86 82 for (; lib->func; lib++) 87 83 { … … 89 85 lua_pushstring(d_state, lib->name); 90 86 lua_call(d_state, 1, 0); 91 87 } 92 #else /* CEGUI_LUA_VER >= 51 */88 #else /* LUA_VERSION_NUM >= 501 */ 93 89 luaopen_base(d_state); 94 90 luaopen_io(d_state); 95 91 luaopen_string(d_state); … … 98 94 #if defined(DEBUG) || defined (_DEBUG) 99 95 luaopen_debug(d_state); 100 96 #endif 101 #endif /* CEGUI_LUA_VER >= 51 */97 #endif /* LUA_VERSION_NUM >= 501 */ 102 98 103 99 setModuleIdentifierString(); 104 100 }
Note: See TracBrowser
for help on using the repository browser.