updated makefile to boost-python3.3 and python2.4
This commit is contained in:
parent
116f21f182
commit
e14b4a8d48
4 changed files with 7 additions and 7 deletions
|
|
@ -5,13 +5,13 @@
|
|||
# Boost.Python v2
|
||||
#
|
||||
|
||||
CXX = g++ #-3.2
|
||||
CXXFLAGS = -DHAVE_SSTREAM#-g #-DNDEBUG
|
||||
CXX = g++
|
||||
CXXFLAGS = -DHAVE_SSTREAM
|
||||
CPPFLAGS = -Wall -O2 #-g #-O2
|
||||
LDFLAGS =
|
||||
COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
|
||||
LINK = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
|
||||
INC=-I/usr/include/python2.2 -I/home/mkeijzer/src/boost -I.. -ftemplate-depth-50 #-I/usr/include/stlport
|
||||
INC=-I/usr/include/python2.4 -I.. -I../.. -ftemplate-depth-50
|
||||
|
||||
OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \
|
||||
random_numbers.o geneticOps.o selectOne.o continuators.o\
|
||||
|
|
@ -25,7 +25,7 @@ clean:
|
|||
rm PyEO/*.so *.o test/*.pyc
|
||||
|
||||
PyEO/PyEO.so: $(OBJECTS)
|
||||
$(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.2 -shared #-lstlport
|
||||
$(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.4 -shared #-lstlport
|
||||
|
||||
eoFunctorStore.o: ../eoFunctorStore.h ../eoFunctorStore.cpp
|
||||
$(COMPILE) -o eoFunctorStore.o ../eoFunctorStore.cpp $(INC)
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ int spin(eoRng& _rng, numeric::array values, double total)
|
|||
|
||||
void random_numbers()
|
||||
{
|
||||
class_<eoRng, boost::noncopyable>("eoRng", init<uint32>())
|
||||
class_<eoRng, boost::noncopyable>("eoRng", init<uint32_t>())
|
||||
.def("flip", &eoRng::flip)
|
||||
.def("random", &eoRng::random)
|
||||
.def("rand", &eoRng::rand)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
return call_method<std::string>(self, "getValueAsString");
|
||||
}
|
||||
|
||||
void setValue(std::string s)
|
||||
void setValue(const std::string& s)
|
||||
{
|
||||
call_method<void>(self, "setValueAsString", s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class ValueParam : public eoParam // ValueParam containing python object
|
|||
return std::string(boost::python::extract<const char*>(s));
|
||||
}
|
||||
|
||||
void setValue(std::string v)
|
||||
void setValue(const std::string& v)
|
||||
{
|
||||
std::cerr << "not implemented yet" << std::endl;
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue