Kompatibilität zu luabind-b7

This commit is contained in:
Enno Rehling 2004-09-05 14:08:10 +00:00
parent d0cf3d50a7
commit 0a27d60de0
5 changed files with 16 additions and 3 deletions

View File

@ -29,7 +29,11 @@ CCFLAGS += -Wwrite-strings
-Wno-char-subscripts -Wno-char-subscripts
; ;
if $(HOST) = "hamunaptra" {
XMLHDRS = /homes2/info-f/enno/software/hamunaptra/include/libxml2 ;
} else {
XMLHDRS = /usr/include/libxml2 ; XMLHDRS = /usr/include/libxml2 ;
}
rule iconv rule iconv
{ {
@ -40,7 +44,12 @@ rule iconv
rule luabind rule luabind
{ {
LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ; LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ;
if $(HOST) = "hamunaptra" {
LINKLIBS on $(<) += -llua -llualib ;
} else {
LINKLIBS on $(<) += -llua50 -llualib50 ;
}
LINKLIBS on $(<) += -lm -lluabind ; LINKLIBS on $(<) += -lm -lluabind ;
} }

View File

@ -11,6 +11,7 @@
// lua includes // lua includes
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/operator.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
// util includes // util includes
@ -139,8 +140,8 @@ bind_building(lua_State * L)
def("add_building", &add_building), def("add_building", &add_building),
class_<struct building>("building") class_<struct building>("building")
.def(tostring(self))
.def(self == building()) .def(self == building())
.def(tostring(self))
.property("name", &building_getname, &building_setname) .property("name", &building_getname, &building_setname)
.property("info", &building_getinfo, &building_setinfo) .property("info", &building_getinfo, &building_setinfo)
.property("units", &building_units, return_stl_iterator) .property("units", &building_units, return_stl_iterator)

View File

@ -18,6 +18,7 @@
// lua includes // lua includes
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/operator.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#include <ostream> #include <ostream>

View File

@ -12,6 +12,7 @@
// lua includes // lua includes
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/operator.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#include <ostream> #include <ostream>

View File

@ -28,6 +28,7 @@
// lua includes // lua includes
#include <lua.hpp> #include <lua.hpp>
#include <luabind/luabind.hpp> #include <luabind/luabind.hpp>
#include <luabind/operator.hpp>
#include <luabind/iterator_policy.hpp> #include <luabind/iterator_policy.hpp>
#include <ostream> #include <ostream>