diff -Nurd -x'*~' evolvotron.orig/common.pro evolvotron/common.pro --- evolvotron.orig/common.pro 2005-05-11 14:23:36.000000000 -0400 +++ evolvotron/common.pro 2012-03-07 15:50:07.000000000 -0500 @@ -79,8 +79,8 @@ # This probably wouldn't be usable until all the strings were moved out of the app - see Qt I18N docs. # Also add gcc threading option (not entirely clear whether this is needed but it doesn't seem to hurt) -QMAKE_CXXFLAGS_RELEASE += -DQT_NO_ASCII_CAST -pthread -QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST -pthread +QMAKE_CXXFLAGS_RELEASE += -DQT_NO_ASCII_CAST +QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST ###################################### # Hide those crufty moc_ files away diff -Nurd -x'*~' evolvotron.orig/evolvotron/evolvotron.pro evolvotron/evolvotron/evolvotron.pro --- evolvotron.orig/evolvotron/evolvotron.pro 2003-07-10 03:43:23.000000000 -0400 +++ evolvotron/evolvotron/evolvotron.pro 2012-03-07 15:51:10.000000000 -0500 @@ -15,3 +15,4 @@ INSTALLS += target +QMAKE_LFLAGS_RELEASE += -undefined dynamic_lookup diff -Nurd -x'*~' evolvotron.orig/libevolvotron/function_node.h evolvotron/libevolvotron/function_node.h --- evolvotron.orig/libevolvotron/function_node.h 2004-08-25 03:38:17.000000000 -0400 +++ evolvotron/libevolvotron/function_node.h 2012-03-07 15:52:02.000000000 -0500 @@ -133,7 +133,7 @@ static const std::vector stubargs(const MutationParameters& parameters,uint n,bool exciting=false); //! Return a suitable starting value for a node's iteration count (assuming it's iterative). - static const uint FunctionNode::stubiterations(const MutationParameters& parameters); + static const uint stubiterations(const MutationParameters& parameters); //! Constructor given an array of params and args and an iteration count. /*! These MUST be provided; there are no alterative constructors. diff -Nurd -x'*~' evolvotron.orig/libevolvotron/mutation_parameters.h evolvotron/libevolvotron/mutation_parameters.h --- evolvotron.orig/libevolvotron/mutation_parameters.h 2004-08-25 03:38:17.000000000 -0400 +++ evolvotron/libevolvotron/mutation_parameters.h 2012-03-07 15:52:32.000000000 -0500 @@ -266,7 +266,7 @@ //! This returns a new random bit of tree. /*! Setting the "exciting" flag avoids the most basic node types, but only at the top level of the stub tree. */ - FunctionNode*const MutationParameters::random_function_stub(bool exciting) const; + FunctionNode*const random_function_stub(bool exciting) const; void change_function_weighting(const FunctionRegistration* fn,real w); @@ -277,7 +277,7 @@ protected: //! Return a random function appropriately biased by current settings - FunctionNode*const MutationParameters::random_function() const; + FunctionNode*const random_function() const; //! Return a random function registration, appropriately biased by current settings const FunctionRegistration*const random_weighted_function_registration() const;