From a5d27679da3b939887c012d24ae6dabe6138db82 Mon Sep 17 00:00:00 2001
From: jmerelo <jmerelo>
Date: Tue, 9 Feb 1999 18:40:00 +0000
Subject: [PATCH] Changes to makefiles and other things

---
 eo/src/Makefile.am      | 4 ++--
 eo/src/eoBitOp.h        | 5 ++---
 eo/src/eoBitOpFactory.h | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am
index 005a6a0e..12dd182b 100644
--- a/eo/src/Makefile.am
+++ b/eo/src/Makefile.am
@@ -4,8 +4,8 @@
 ##
 ###############################################################################
 
-lib_LTLIBRARIES = libeo.la
-libeo_la_SOURCES =  eoPrintable.cpp eoPersistent.cpp
+lib_LIBRARIES = libeo.a
+libeo_a_SOURCES =  eoPrintable.cpp eoPersistent.cpp
 
 libeoincdir = $(includedir)/eo
 libeoinc_HEADERS = eo EO.h eoDup.h eoMultiMonOp.h eoPop.h eoUniform.h eoESChrom.h eoNegExp.h eoProblem.h eoVector.h eoFitness.h eoNormal.h eoRnd.h eoXOver2.h eo1d.h eoID.h eoObject.h eoString.h eoAged.h eoKill.h eoOp.h eoTranspose.h eoBin.h eoPrintable.h eoPersistent.h eoLottery.h eoMutation.h eoPopOps.h eoUniform.h eoInsertion.h eoBitOp.h
diff --git a/eo/src/eoBitOp.h b/eo/src/eoBitOp.h
index 1b1cda9f..98eea6e7 100644
--- a/eo/src/eoBitOp.h
+++ b/eo/src/eoBitOp.h
@@ -10,13 +10,12 @@
 #include <eoBin.h>  // eoBin
 #include <eoOp.h>   // eoMonOp
 
-#ifndef min
+#ifdef _MSC_VER
 #define min _MIN
-#endif
-#ifndef max
 #define max _MAX
 #endif
 
+
 //-----------------------------------------------------------------------------
 // eoBinRandom --> mofify a chromosome in a random way
 //-----------------------------------------------------------------------------
diff --git a/eo/src/eoBitOpFactory.h b/eo/src/eoBitOpFactory.h
index 6ccda585..2ca12d75 100644
--- a/eo/src/eoBitOpFactory.h
+++ b/eo/src/eoBitOpFactory.h
@@ -45,7 +45,7 @@ public:
 		eoOp<EOT> * opPtr = NULL;
 		try {
 			opPtr = eoOpFactory<EOT>::make( _is );
-		} catch ( string& objectTypeStr ) {
+		} catch ( const string& objectTypeStr ) {
 			if  ( objectTypeStr == "eoBinRandom") {
 				opPtr = new eoBinRandom<EOT>();
 			}