Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #885 luabind (On Windows Breaks Compiling)

Browse source
This commit is contained in:
kervala 2010-05-12 11:12:19 +02:00
parent 538f7abb14
commit b91fe891f3
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/interface_v3/lua_helper.cpp
View file

@ -31,6 +31,10 @@ extern "C"
#include "lualib.h"
}
// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
#include <cassert>
#undef assert
#define assert nlassert
#include <luabind/luabind.hpp>
using namespace std;

32
code/ryzom/client/src/interface_v3/lua_ihm.cpp
View file

@ -25,19 +25,6 @@
# undef for
# endif
#endif
#include <luabind/luabind.hpp>
#if LUABIND_MAX_ARITY == 10
# define LUABIND_VERSION 07
#elif LUABIND_MAX_ARITY == 5
# define LUABIND_VERSION 06
#else
# pragma error("luabind version not recognized")
#endif
#if LUABIND_VERSION == 07
# include <luabind/operator.hpp>
#endif
#include "lua_ihm.h"
#include "reflect.h"
@ -96,7 +83,6 @@
#include "game_share/bg_downloader_msg.h"
#include "game_share/constants.h"
#ifdef LUA_NEVRAX_VERSION
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
#endif
@ -114,6 +100,24 @@ Compilation is VERY SLOW
*/
// ***************************************************************************
// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
#include <cassert>
#undef assert
#define assert nlassert
#include <luabind/luabind.hpp>
#if LUABIND_MAX_ARITY == 10
# define LUABIND_VERSION 07
#elif LUABIND_MAX_ARITY == 5
# define LUABIND_VERSION 06
#else
# pragma error("luabind version not recognized")
#endif
#if LUABIND_VERSION == 07
# include <luabind/operator.hpp>
#endif
using namespace NLMISC;
using namespace NLGEORGES;
using namespace R2;