[SCM] OCE packaging branch, debian, updated. debian/0.11-1

tpaviot tpaviot at gmail.com
Thu Dec 13 19:16:36 UTC 2012


The following commit has been merged in the debian branch:
commit 87f6ab2f02b8a92263880376dfadd1060fc72fcf
Author: tpaviot <tpaviot at gmail.com>
Date:   Sat Nov 17 07:09:53 2012 +0100

    On OSX, native OpenGl header should never be called, but only the X11 GL headers: OCE only supports X11, not Cocoa

diff --git a/inc/OpenGl_GlCore11.hxx b/inc/OpenGl_GlCore11.hxx
index 6932fdf..c1f0c6d 100644
--- a/inc/OpenGl_GlCore11.hxx
+++ b/inc/OpenGl_GlCore11.hxx
@@ -45,14 +45,8 @@
 #define GL_GLEXT_LEGACY
 
 // include main OpenGL header provided with system
-#if defined(__APPLE__)
-  #include <OpenGL/gl.h>
-  #include <OpenGL/glu.h>
-  #define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
-#else
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-#endif
+#include <GL/gl.h>
+#include <GL/glu.h>
 
 #include <InterfaceGraphic.hxx>
 #include <InterfaceGraphic_tgl_all.hxx>

-- 
OCE packaging



More information about the debian-science-commits mailing list