Fixed build with g2o on Windows

This commit is contained in:
matlabbe
2016-01-14 17:07:01 -05:00
parent 444879ffc6
commit 2d6965aa4b
6 changed files with 44 additions and 24 deletions

View File

@@ -8,12 +8,11 @@
#include "edge_se2MaxMixture.h"
#include <GL/gl.h>
using namespace std;
using namespace Eigen;
// ================================================
EdgeSE2MaxMixture::EdgeSE2MaxMixture() : g2o::EdgeSE2::EdgeSE2()
EdgeSE2MaxMixture::EdgeSE2MaxMixture()
{
nullHypothesisMoreLikely = false;
}
@@ -89,6 +88,7 @@ void EdgeSE2MaxMixture::computeError()
}
/*
#include <GL/gl.h>
// ================================================
#ifdef G2O_HAVE_OPENGL
EdgeSE2MaxMixtureDrawAction::EdgeSE2MaxMixtureDrawAction(): DrawAction(typeid(EdgeSE2MaxMixture).name()){}

View File

@@ -10,7 +10,6 @@
#include "vertigo/g2o/edge_se2Switchable.h"
#include "vertigo/g2o/vertex_switchLinear.h"
#include <GL/gl.h>
using namespace std;
using namespace Eigen;
@@ -103,6 +102,7 @@ void EdgeSE2Switchable::computeError()
}
/*
#include <GL/gl.h>
#ifdef G2O_HAVE_OPENGL
EdgeSE2SwitchableDrawAction::EdgeSE2SwitchableDrawAction(): DrawAction(typeid(EdgeSE2Switchable).name()){}

View File

@@ -10,7 +10,6 @@
#include "vertigo/g2o/edge_se3Switchable.h"
#include "vertigo/g2o/vertex_switchLinear.h"
#include <GL/gl.h>
#include "g2o/types/slam3d/vertex_se3.h"
#include "g2o/types/slam3d/isometry3d_gradients.h"
@@ -93,6 +92,7 @@ void EdgeSE3Switchable::computeError()
}
/*
#include <GL/gl.h>
#ifdef G2O_HAVE_OPENGL
EdgeSE3SwitchableDrawAction::EdgeSE3SwitchableDrawAction(): DrawAction(typeid(EdgeSE3Switchable).name()){}