From 3f05d160484cd00c3d9a31abff93733b718515bb Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@trolltech.com>
Date: Thu, 20 May 2010 13:17:10 +0200
Subject: Compile on Mac OS X

---
 model.cpp     | 2 +-
 modelitem.cpp | 4 ++--
 wolfenqt.pro  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/model.cpp b/model.cpp
index c9e9c16..fde3b14 100644
--- a/model.cpp
+++ b/model.cpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE."
 #include <QVarLengthArray>
 
 #ifndef QT_NO_OPENGL
-#ifndef QT_OPENGL_ES_2
+#if !defined QT_OPENGL_ES_2 && !defined Q_WS_MAC
 #include <GL/glew.h>
 #endif
 #include <QtOpenGL>
diff --git a/modelitem.cpp b/modelitem.cpp
index 5a656ff..36eb7c7 100644
--- a/modelitem.cpp
+++ b/modelitem.cpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE."
 #include "mazescene.h"
 
 #ifndef QT_NO_OPENGL
-#ifndef QT_OPENGL_ES_2
+#if !defined QT_OPENGL_ES_2 && !defined Q_WS_MAC
 #include <GL/glew.h>
 #endif
 #include <QtOpenGL>
@@ -155,7 +155,7 @@ void ModelItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidg
     glClear(GL_DEPTH_BUFFER_BIT);
 
     if (!m_program) {
-#ifndef QT_OPENGL_ES_2
+#if !defined QT_OPENGL_ES_2 && !defined Q_WS_MAC
         glewInit();
 #endif
         m_program = new QGLShaderProgram;
diff --git a/wolfenqt.pro b/wolfenqt.pro
index 1806bd5..259ff70 100644
--- a/wolfenqt.pro
+++ b/wolfenqt.pro
@@ -13,7 +13,7 @@ QT += webkit script
 
 contains(QT_CONFIG, opengl):{
 QT += opengl
-unix:!contains(QT_CONFIG, opengles2): LIBS += -lGLEW
+unix:!mac:!contains(QT_CONFIG, opengles2) LIBS += -lGLEW
 }
 
 contains(QT_CONFIG, phonon):{
-- 
cgit v1.2.3