summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jose.r.fonseca@gmail.com>2011-10-09 17:05:58 +0100
committerJosé Fonseca <jose.r.fonseca@gmail.com>2011-10-09 17:05:58 +0100
commit06d66090532470b2a769e80e760559d572657c28 (patch)
treeec854587fed6554abeccf83ad86d5930c326e749
parenteac8178b27cad12e597ff425347932601df91ca3 (diff)
Fix MacOSX build.
-rw-r--r--glws_glx.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/glws_glx.cpp b/glws_glx.cpp
index 23b4082..c082417 100644
--- a/glws_glx.cpp
+++ b/glws_glx.cpp
@@ -29,7 +29,14 @@
#include <iostream>
#include "glws.hpp"
+
+#ifdef __APPLE__
+#include <X11/Xlib.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#else
#include "glproc.hpp"
+#endif
namespace glws {
@@ -297,7 +304,7 @@ createContext(const Visual *_visual, Context *shareContext)
share_context = dynamic_cast<GlxContext*>(shareContext)->context;
}
-
+#ifndef __APPLE__
if (glxVersion >= 0x0104 && has_GLX_ARB_create_context) {
Attributes<int> attribs;
attribs.add(GLX_RENDER_TYPE, GLX_RGBA_TYPE);
@@ -307,7 +314,9 @@ createContext(const Visual *_visual, Context *shareContext)
attribs.end();
context = glXCreateContextAttribsARB(display, visual->fbconfig, share_context, True, attribs);
- } else if (glxVersion >= 0x103) {
+ } else
+#endif
+ if (glxVersion >= 0x103) {
context = glXCreateNewContext(display, visual->fbconfig, GLX_RGBA_TYPE, share_context, True);
} else {
context = glXCreateContext(display, visual->visinfo, share_context, True);