Fixed: #885 luabind (On Windows Breaks Compiling)
This commit is contained in:
parent
6bfba3d85b
commit
29bc9970c2
2 changed files with 22 additions and 14 deletions
code/ryzom/client/src/interface_v3
|
@ -31,6 +31,10 @@ extern "C"
|
||||||
#include "lualib.h"
|
#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>
|
#include <luabind/luabind.hpp>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -25,19 +25,6 @@
|
||||||
# undef for
|
# undef for
|
||||||
# endif
|
# endif
|
||||||
#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 "lua_ihm.h"
|
||||||
#include "reflect.h"
|
#include "reflect.h"
|
||||||
|
@ -96,7 +83,6 @@
|
||||||
#include "game_share/bg_downloader_msg.h"
|
#include "game_share/bg_downloader_msg.h"
|
||||||
#include "game_share/constants.h"
|
#include "game_share/constants.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef LUA_NEVRAX_VERSION
|
#ifdef LUA_NEVRAX_VERSION
|
||||||
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
|
#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
|
||||||
#endif
|
#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 NLMISC;
|
||||||
using namespace NLGEORGES;
|
using namespace NLGEORGES;
|
||||||
using namespace R2;
|
using namespace R2;
|
||||||
|
|
Loading…
Reference in a new issue