From 1fec532b3f26cefa065493aa88a5fc0564b028d5 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 19 May 2010 09:46:03 +0200 Subject: [PATCH] Fixed: #918 Luabind 0.7 is not correctly detected --- code/ryzom/client/src/interface_v3/lua_ihm.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp index 982201346..18f77fb49 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp @@ -31,9 +31,15 @@ #undef assert #define assert nlassert #include +// in luabind > 0.6, LUABIND_MAX_ARITY is set to 10 #if LUABIND_MAX_ARITY == 10 -# include # include +# include +# ifndef LUABIND_VERSION +// luabind 0.7 doesn't define LUABIND_VERSION +# define LUABIND_VERSION 700 +# endif +// luabind 0.6 doesn't define LUABIND_VERSION but LUABIND_MAX_ARITY is set to 5 #elif LUABIND_MAX_ARITY == 5 # define LUABIND_VERSION 600 #else