Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

slightly improved, but still hackish way to recognize luabind versions.

This commit is contained in:
Enno Rehling 2006-01-02 20:24:33 +00:00
parent bf6dbe4b26
commit 83e9b7a994
11 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eressea/lua/building.cpp
View File

@ -14,7 +14,7 @@
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA >= 7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

2
src/eressea/lua/faction.cpp
View File

@ -25,7 +25,7 @@
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#include <luabind/out_value_policy.hpp> #include <luabind/out_value_policy.hpp>
#include <luabind/copy_policy.hpp> #include <luabind/copy_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA >= 7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

2
src/eressea/lua/message.cpp
View File

@ -15,7 +15,7 @@
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA >= 7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

2
src/eressea/lua/objects.cpp
View File

@ -52,7 +52,7 @@ namespace eressea {
} }
} }
} }
#ifdef LUABIND_OLD #if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
return object(L); // nil return object(L); // nil
#else #else
return object(); // nil return object(); // nil

2
src/eressea/lua/region.cpp
View File

@ -17,7 +17,7 @@
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA >= 7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

2
src/eressea/lua/script.cpp
View File

@ -192,7 +192,7 @@ lua_changeresource(unit * u, const struct resource_type * rtype, int delta)
bool bool
is_function(struct lua_State * luaState, const char * fname) is_function(struct lua_State * luaState, const char * fname)
{ {
#ifndef LUABIND_OLD #if LUABIND_BETA>7 || (LUABIND_BETA==7 && LUABIND_DEVEL>=2)
object g = globals(luaState); object g = globals(luaState);
object fun = g[fname]; object fun = g[fname];
if (fun.is_valid()) { if (fun.is_valid()) {

2
src/eressea/lua/ship.cpp
View File

@ -11,7 +11,7 @@
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA >= 7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

2
src/eressea/lua/unit.cpp
View File

@ -31,7 +31,7 @@
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#ifdef HAVE_LUABIND_B7 #if LUABIND_BETA>=7
# include <luabind/operator.hpp> # include <luabind/operator.hpp>
#endif #endif

4
src/eressea/server.cpp
View File

@ -458,7 +458,7 @@ usage(const char * prog, const char * arg)
static void static void
setLuaString(lua_State * luaState, const char * name, const char * value) setLuaString(lua_State * luaState, const char * name, const char * value)
{ {
#ifdef LUABIND_OLD #if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
luabind::object g = luabind::get_globals(luaState); luabind::object g = luabind::get_globals(luaState);
#else #else
luabind::object g = luabind::globals(luaState); luabind::object g = luabind::globals(luaState);
@ -469,7 +469,7 @@ setLuaString(lua_State * luaState, const char * name, const char * value)
static void static void
setLuaNumber(lua_State * luaState, const char * name, double value) setLuaNumber(lua_State * luaState, const char * name, double value)
{ {
#ifdef LUABIND_OLD #if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
luabind::object g = luabind::get_globals(luaState); luabind::object g = luabind::get_globals(luaState);
#else #else
luabind::object g = luabind::globals(luaState); luabind::object g = luabind::globals(luaState);

9
src/lua.hpp
View File

@ -3,7 +3,14 @@ extern "C" {
#include <lua50/lauxlib.h> #include <lua50/lauxlib.h>
#include <lua50/lualib.h> #include <lua50/lualib.h>
} }
#ifndef LUABIND_BETA
# include <boost/version.hpp> # include <boost/version.hpp>
# if BOOST_VERSION < 103300 # if BOOST_VERSION < 103300
# define LUABIND_OLD # define LUABIND_BETA 7
# define LUABIND_DEVEL 1
# else
# define LUABIND_BETA 7
# define LUABIND_DEVEL 2
# endif
#endif #endif

2
src/res/eressea/de/strings.xml
View File

@ -38,7 +38,7 @@
region of Muschelplateau. region of Muschelplateau.
</text> </text>
<text locale="de"> <text locale="de">
Dieses Abzeichen identifiziert die Partei seines Träger offiziell Dieses Abzeichen identifiziert die Partei seines Trägers offiziell
als einen Besucher der Botschafterregion 'Muschelplateau'. als einen Besucher der Botschafterregion 'Muschelplateau'.
</text> </text>
</string> </string>