nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated makefile to boost-python3.3 and python2.4

Browse source
This commit is contained in:
maartenkeijzer 2006-01-23 15:12:49 +00:00
commit e14b4a8d48
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eo/src/pyeo/Makefile
View file

@ -5,13 +5,13 @@
# Boost.Python v2 # Boost.Python v2
# #
CXX = g++ #-3.2 CXX = g++
CXXFLAGS = -DHAVE_SSTREAM#-g #-DNDEBUG CXXFLAGS = -DHAVE_SSTREAM
CPPFLAGS = -Wall -O2 #-g #-O2 CPPFLAGS = -Wall -O2 #-g #-O2
LDFLAGS = LDFLAGS =
COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
LINK = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) 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 \ OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \
random_numbers.o geneticOps.o selectOne.o continuators.o\ random_numbers.o geneticOps.o selectOne.o continuators.o\
@ -25,7 +25,7 @@ clean:
rm PyEO/*.so *.o test/*.pyc rm PyEO/*.so *.o test/*.pyc
PyEO/PyEO.so: $(OBJECTS) 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 eoFunctorStore.o: ../eoFunctorStore.h ../eoFunctorStore.cpp
$(COMPILE) -o eoFunctorStore.o ../eoFunctorStore.cpp $(INC) $(COMPILE) -o eoFunctorStore.o ../eoFunctorStore.cpp $(INC)

2
eo/src/pyeo/random_numbers.cpp
View file

@ -88,7 +88,7 @@ int spin(eoRng& _rng, numeric::array values, double total)
void random_numbers() void random_numbers()
{ {
class_<eoRng, boost::noncopyable>("eoRng", init<uint32>()) class_<eoRng, boost::noncopyable>("eoRng", init<uint32_t>())
.def("flip", &eoRng::flip) .def("flip", &eoRng::flip)
.def("random", &eoRng::random) .def("random", &eoRng::random)
.def("rand", &eoRng::rand) .def("rand", &eoRng::rand)

2
eo/src/pyeo/valueParam.cpp
View file

@ -45,7 +45,7 @@ public:
return call_method<std::string>(self, "getValueAsString"); return call_method<std::string>(self, "getValueAsString");
} }
void setValue(std::string s) void setValue(const std::string& s)
{ {
call_method<void>(self, "setValueAsString", s); call_method<void>(self, "setValueAsString", s);
} }

2
eo/src/pyeo/valueParam.h
View file

@ -30,7 +30,7 @@ class ValueParam : public eoParam // ValueParam containing python object
return std::string(boost::python::extract<const char*>(s)); 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; std::cerr << "not implemented yet" << std::endl;
} }