diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-05-20 13:17:10 +0200 |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-05-21 15:21:30 +0200 |
| commit | 3f05d160484cd00c3d9a31abff93733b718515bb (patch) | |
| tree | 38315e214c8ee554692c298dc15f2bb4f8013472 | |
| parent | 539e6a9bc0abc188f04534735df6b5d34cf1532f (diff) | |
Compile on Mac OS X
| -rw-r--r-- | model.cpp | 2 | ||||
| -rw-r--r-- | modelitem.cpp | 4 | ||||
| -rw-r--r-- | wolfenqt.pro | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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):{ |