From d4b20d8833c7b2de3b9592cedb025a7f533297ae Mon Sep 17 00:00:00 2001 From: evomarc Date: Mon, 3 Dec 2001 14:31:35 +0000 Subject: [PATCH] MSVC didn't find (easily) the contrib/MGE dir. So now it's written in the code and the Makefile.am does not have contrib in the include look path --- eo/test/Makefile.am | 2 +- eo/test/t-MGE-control.cpp | 6 +++--- eo/test/t-MGE.cpp | 6 +++--- eo/test/t-MGE1bit.cpp | 6 +++--- eo/test/t-eoVirus.cpp | 5 +++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/eo/test/Makefile.am b/eo/test/Makefile.am index 338bef4c1..70223600a 100644 --- a/eo/test/Makefile.am +++ b/eo/test/Makefile.am @@ -8,7 +8,7 @@ DEPS = $(top_builddir)/src/utils/libeoutils.a $(top_builddir)/src/libeo.a ############################################################################### -INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/contrib +INCLUDES = -I$(top_builddir)/src LDADDS = $(top_builddir)/src/utils/libeoutils.a $(top_builddir)/src/libeo.a CXXFLAGS = -g -Wall ############################################################################### diff --git a/eo/test/t-MGE-control.cpp b/eo/test/t-MGE-control.cpp index f34d0699d..c7d857d22 100644 --- a/eo/test/t-MGE-control.cpp +++ b/eo/test/t-MGE-control.cpp @@ -13,9 +13,9 @@ #include "RoyalRoad.h" // Viri -#include -#include -#include +#include "../contrib/MGE/VirusOp.h" +#include "../contrib/MGE/eoVirus.h" +#include "../contrib/MGE/eoInitVirus.h" //----------------------------------------------------------------------------- diff --git a/eo/test/t-MGE.cpp b/eo/test/t-MGE.cpp index 387220ac7..4fd76f435 100644 --- a/eo/test/t-MGE.cpp +++ b/eo/test/t-MGE.cpp @@ -13,9 +13,9 @@ #include "RoyalRoad.h" // Viri -#include -#include -#include +#include "../contrib/MGE/VirusOp.h" +#include "../contrib/MGE/eoVirus.h" +#include "../contrib/MGE/eoInitVirus.h" //----------------------------------------------------------------------------- diff --git a/eo/test/t-MGE1bit.cpp b/eo/test/t-MGE1bit.cpp index 356f7fd20..d6ab91e55 100644 --- a/eo/test/t-MGE1bit.cpp +++ b/eo/test/t-MGE1bit.cpp @@ -13,9 +13,9 @@ #include "RoyalRoad.h" // Viri -#include -#include -#include +#include "../contrib/MGE/VirusOp.h" +#include "../contrib/MGE/eoVirus.h" +#include "../contrib/MGE/eoInitVirus.h" //----------------------------------------------------------------------------- diff --git a/eo/test/t-eoVirus.cpp b/eo/test/t-eoVirus.cpp index 65b39bdca..5ad4067f6 100644 --- a/eo/test/t-eoVirus.cpp +++ b/eo/test/t-eoVirus.cpp @@ -26,8 +26,9 @@ #include // cout #include // ostrstream, istrstream #include // general EO -#include // bitstring representation & operators -#include +#include "../contrib/MGE/VirusOp.h" +#include "../contrib/MGE/eoVirus.h" +#include "../contrib/MGE/eoInitVirus.h" #include #include "binary_value.h"