Fixed: Compilation with recent boost versions

This commit is contained in:
kervala 2010-10-19 14:19:10 +02:00
parent 6a142dc22f
commit 97c60ebe4e
3 changed files with 27 additions and 11 deletions

View file

@ -26,15 +26,20 @@
#endif #endif
extern "C" #include "lua_loadlib.h"
{
#include "lualib.h"
}
// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages // to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
#include <cassert> #include <cassert>
#ifdef assert
#undef assert #undef assert
#define assert nlassert #endif
#ifdef NL_DEBUG
#define assert(x) nlassert(x)
#else
#define assert(x)
#endif
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
using namespace std; using namespace std;

View file

@ -28,8 +28,16 @@
// to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages // to get rid of you_must_not_use_assert___use_nl_assert___read_debug_h_file messages
#include <cassert> #include <cassert>
#ifdef assert
#undef assert #undef assert
#define assert nlassert #endif
#ifdef NL_DEBUG
#define assert(x) nlassert(x)
#else
#define assert(x)
#endif
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
// in luabind > 0.6, LUABIND_MAX_ARITY is set to 10 // in luabind > 0.6, LUABIND_MAX_ARITY is set to 10
#if LUABIND_MAX_ARITY == 10 #if LUABIND_MAX_ARITY == 10

View file

@ -17,9 +17,12 @@
#ifndef LUA_LOADLIB_H #ifndef LUA_LOADLIB_H
#define LUA_LOADLIB_H #define LUA_LOADLIB_H
#include "lua.h" extern "C"
#include "lauxlib.h" {
#include "lualib.h" #include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
}
// load the lua dll, return 1 on success // load the lua dll, return 1 on success
//int loadLuaDLL(); //int loadLuaDLL();