Fix compilation

cginternals · Mar 30, 2016 · e764f3d · e764f3d
1 parent a5fa245
commit e764f3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/source/gloperate-glfw/source/WindowEventDispatcher.cpp b/source/gloperate-glfw/source/WindowEventDispatcher.cpp
@@ -222,7 +222,7 @@ void WindowEventDispatcher::handleCursorPos(GLFWwindow* glfwWindow, double xPos,
 
 void WindowEventDispatcher::handleCursorEnter(GLFWwindow* glfwWindow, int entered)
 {
-    if (entered == static_cast<int>(gl::GL_TRUE))
+    if (entered == static_cast<int>(GL_TRUE))
     {
         dispatchEvent(glfwWindow, new MouseEnterEvent);
     }
@@ -254,12 +254,12 @@ void WindowEventDispatcher::handleMove(GLFWwindow* glfwWindow, int x, int y)
 
 void WindowEventDispatcher::handleFocus(GLFWwindow* glfwWindow, int focused)
 {
-    dispatchEvent(glfwWindow, new FocusEvent(focused == static_cast<int>(gl::GL_TRUE)));
+    dispatchEvent(glfwWindow, new FocusEvent(focused == static_cast<int>(GL_TRUE)));
 }
 
 void WindowEventDispatcher::handleIconify(GLFWwindow* glfwWindow, int iconified)
 {
-    dispatchEvent(glfwWindow, new IconifyEvent(iconified == static_cast<int>(gl::GL_TRUE)));
+    dispatchEvent(glfwWindow, new IconifyEvent(iconified == static_cast<int>(GL_TRUE)));
 }
 
 void WindowEventDispatcher::handleClose(GLFWwindow* glfwWindow)

diff --git a/source/gloperate-osg/source/OsgFboRenderStage_osg.cpp b/source/gloperate-osg/source/OsgFboRenderStage_osg.cpp
@@ -1,9 +1,6 @@
 
 #include <gloperate-osg/OsgFboRenderStage.h>
 
-#undef __gl_h_ // dirtiest hack imaginale
-// TODO: find a solution for GL/gl.h and glbinding/gl/gl.h
-
 #include <osgViewer/Viewer>
 #include <osgViewer/Renderer>