Commits

David Rogers committed ec88134

Fix Linux GL unity build.

  • Participants
  • Parent commits 1c1642b
  • Branches v1-9

Comments (0)

Files changed (3)

RenderSystems/GL3Plus/include/GLX/OgreGLXUtils.h

 #define __GLXUtils_H__
 
 #include "OgrePrerequisites.h"
-#include <X11/Xlib.h>
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #include <GL/glxext.h>

RenderSystems/GL3Plus/src/GLX/OgreGLXGLSupport.cpp

 #include "OgreGLXUtils.h"
 #include "OgreGLXWindow.h"
 
+#ifndef Status
+#define Status int
+#endif
+
+#include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 
 static bool ctxErrorOccurred = false;

RenderSystems/GL3Plus/src/GLX/OgreGLXWindow.cpp

 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
-#include <X11/extensions/Xrandr.h>
-
 extern "C"
 {
 	int