Merge branch 'master' into cgl-context

Conflicts:
	include/IContext.hpp
	libBoo.pro

include/CGLXContext.hpp

@@ -0,0 +1,27 @@
+#ifndef CGLXCONTEXT_HPP
+#define CGLXCONTEXT_HPP
+
+#include <GL/glx.h>
+
+#include <IContext.hpp>
+
+class CGLXContext final : public IContext
+{
+public:
+    CGLXContext();
+    virtual ~CGLXContext() {}
+
+    const std::string version() const override;
+    const std::string name() const override;
+    int depthSize() const override;
+    int redDepth() const override;
+    int greenDepth() const override;
+    int blueDepth() const override;
+private:
+    int m_minVersion;
+    int m_majVersion;
+};
+
+
+
+#endif // CGLXCONTEXT_HPP

libBoo.pro

@@ -1,2 +1,5 @@
+CONFIG -= Qt
+CONFIG += app c++11
+
 include(libBoo.pri)
 include(test/test.pri)

src/CGLXContext.cpp

@@ -0,0 +1,37 @@
+#include "CGLXContext.hpp"
+#include <iostream>
+
+CGLXContext::CGLXContext()
+{
+    std::cout << "Hello from GLX" << std::endl;
+}
+
+const std::string CGLXContext::version() const
+{
+    return "Invalid version";
+}
+
+const std::string CGLXContext::name() const
+{
+    return "GLX Context";
+}
+
+int CGLXContext::depthSize() const
+{
+    return -1;
+}
+
+int CGLXContext::redDepth() const
+{
+    return -1;
+}
+
+int CGLXContext::greenDepth() const
+{
+    return -1;
+}
+
+int CGLXContext::blueDepth() const
+{
+    return -1;
+}