make include gl.h multiplatform

On OSX the location of gl.h is a bit weird.

Also fix a problem with where our example data ends up being dumped when
running unittests

diff --git a/alg/glsequence.hpp b/alg/glsequence.hpp
index b9a84f91ada055933b33aabdee803f12bf74c735..4e992f3ee05ab2038e3a9bd892f5a8b58c634c76 100644 (file)
--- a/alg/glsequence.hpp
+++ b/alg/glsequence.hpp
@@ -4,7 +4,13 @@
 #include "alg/annotation_colors.hpp"
 #include "alg/sequence.hpp"
 #include "alg/color.hpp"
-#include <gl.h>
+// isn't it lovely how the header file can live in different places?
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+
 //! Manage rendering a mussa sequence track
 /*! The idea is this will keep track of the location of where the sequence
  *  is being rendered, and handle displaying annotations on that track

diff --git a/alg/test/test_mussa.cpp b/alg/test/test_mussa.cpp
index 04886a0a1fd5675438d807576e481fc03ae60e90..da17b226bc510bca0f96799222eec4dc36518dfa 100644 (file)
--- a/alg/test/test_mussa.cpp
+++ b/alg/test/test_mussa.cpp
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE( mussa_load_analysis )
   m1.analyze(0, 0);
 
   Mussa m2;
-  m2.load( example_dir / "mck3test_w30_t20");
+  m2.load( fs::initial_path() / "mck3test_w30_t20");
 
   BOOST_CHECK_EQUAL( m1.size(), m2.size() );
   BOOST_CHECK_EQUAL( m1.get_window(), m2.get_window() );

diff --git a/qui/seqbrowser/SequenceBrowser.hpp b/qui/seqbrowser/SequenceBrowser.hpp
index 85910bcf51648949b6905c7a77c0d5db98ffc6da..219d9d4c84e62ec40c9c773f2b0bb7c441c9012c 100644 (file)
--- a/qui/seqbrowser/SequenceBrowser.hpp
+++ b/qui/seqbrowser/SequenceBrowser.hpp
@@ -5,7 +5,6 @@
 #include <QRectF>
 #include <QPoint>
 #include <vector>
-#include <gl.h>
 
 #include <set>