projects / occt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 595a42a)
0025051: Compilation issues on OS X 10.6.8
authordbv <dbv@opencascade.com>
Fri, 4 Jul 2014 09:14:32 +0000 (13:14 +0400)
committerapn <apn@opencascade.com>
Thu, 10 Jul 2014 10:39:06 +0000 (14:39 +0400)
Added define to prevent inclusion of system glext.h on Mac OS X 10.6.8

src/OpenGl/OpenGl_Context_1.mm patch | blob | blame | history
src/OpenGl/OpenGl_Window_1.mm patch | blob | blame | history

diff --git a/src/OpenGl/OpenGl_Context_1.mm b/src/OpenGl/OpenGl_Context_1.mm
index 0c5bada..f5b5cf7 100644 (file)
--- a/src/OpenGl/OpenGl_Context_1.mm
+++ b/src/OpenGl/OpenGl_Context_1.mm
@@ -15,6 +15,8 @@
 
 #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
 
+#define GL_GLEXT_LEGACY // To prevent inclusion of system glext.h on Mac OS X 10.6.8
+
 #import <Cocoa/Cocoa.h>
 
 #include <OpenGl_GlCore11.hxx>
diff --git a/src/OpenGl/OpenGl_Window_1.mm b/src/OpenGl/OpenGl_Window_1.mm
index 5944404..2ac4f5d 100644 (file)
--- a/src/OpenGl/OpenGl_Window_1.mm
+++ b/src/OpenGl/OpenGl_Window_1.mm
@@ -15,6 +15,8 @@
 
 #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
 
+#define GL_GLEXT_LEGACY // To prevent inclusion of system glext.h on Mac OS X 10.6.8
+
 #import <Cocoa/Cocoa.h>
 
 #include <InterfaceGraphic.hxx>
Open CASCADE Technology repository