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
This commit is contained in:
parent
2aad10d347
commit
d4b20d8833
5 changed files with 13 additions and 12 deletions
|
|
@ -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
|
LDADDS = $(top_builddir)/src/utils/libeoutils.a $(top_builddir)/src/libeo.a
|
||||||
CXXFLAGS = -g -Wall
|
CXXFLAGS = -g -Wall
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
#include "RoyalRoad.h"
|
#include "RoyalRoad.h"
|
||||||
|
|
||||||
// Viri
|
// Viri
|
||||||
#include <MGE/VirusOp.h>
|
#include "../contrib/MGE/VirusOp.h"
|
||||||
#include <MGE/eoVirus.h>
|
#include "../contrib/MGE/eoVirus.h"
|
||||||
#include <MGE/eoInitVirus.h>
|
#include "../contrib/MGE/eoInitVirus.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
#include "RoyalRoad.h"
|
#include "RoyalRoad.h"
|
||||||
|
|
||||||
// Viri
|
// Viri
|
||||||
#include <MGE/VirusOp.h>
|
#include "../contrib/MGE/VirusOp.h"
|
||||||
#include <MGE/eoVirus.h>
|
#include "../contrib/MGE/eoVirus.h"
|
||||||
#include <MGE/eoInitVirus.h>
|
#include "../contrib/MGE/eoInitVirus.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
#include "RoyalRoad.h"
|
#include "RoyalRoad.h"
|
||||||
|
|
||||||
// Viri
|
// Viri
|
||||||
#include <MGE/VirusOp.h>
|
#include "../contrib/MGE/VirusOp.h"
|
||||||
#include <MGE/eoVirus.h>
|
#include "../contrib/MGE/eoVirus.h"
|
||||||
#include <MGE/eoInitVirus.h>
|
#include "../contrib/MGE/eoInitVirus.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,9 @@
|
||||||
#include <iostream> // cout
|
#include <iostream> // cout
|
||||||
#include <strstream> // ostrstream, istrstream
|
#include <strstream> // ostrstream, istrstream
|
||||||
#include <eo> // general EO
|
#include <eo> // general EO
|
||||||
#include <MGE/eoVirus.h> // bitstring representation & operators
|
#include "../contrib/MGE/VirusOp.h"
|
||||||
#include <MGE/VirusOp.h>
|
#include "../contrib/MGE/eoVirus.h"
|
||||||
|
#include "../contrib/MGE/eoInitVirus.h"
|
||||||
#include <utils/eoRndGenerators.h>
|
#include <utils/eoRndGenerators.h>
|
||||||
|
|
||||||
#include "binary_value.h"
|
#include "binary_value.h"
|
||||||
|
|
|
||||||
Reference in a new issue