Ignore:
Timestamp:
Sep 19, 2011, 1:32:18 AM (9 years ago)
Author:
sam
Message:

osx: link with the proper OpenGL libraries on OS X.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/scene.cpp

    r866 r960  
    6060    float angle;
    6161
    62 #if defined HAVE_GL_2X
     62#if defined HAVE_GL_2X && !defined __APPLE__
    6363    GLuint vao;
    6464#endif
     
    8585    data->nbufs = 0;
    8686
    87 #if defined HAVE_GL_2X
     87#if defined HAVE_GL_2X && !defined __APPLE__
    8888    glGenVertexArrays(1, &data->vao);
    8989#endif
     
    9797    if (data->nbufs > 0)
    9898        glDeleteBuffers(data->nbufs, data->bufs);
    99 #if defined HAVE_GL_2X
     99#if defined HAVE_GL_2X && !defined __APPLE__
    100100    glDeleteVertexArrays(1, &data->vao);
    101101#endif
     
    321321    glEnable(GL_DEPTH_TEST);
    322322    glDepthFunc(GL_LEQUAL);
    323 #if defined HAVE_GL_2X
     323#if defined HAVE_GL_2X && !defined __APPLE__
    324324    glEnable(GL_ALPHA_TEST);
    325325    glAlphaFunc(GL_GEQUAL, 0.01f);
     
    360360
    361361        /* Bind vertex, color and texture coordinate buffers */
    362 #if defined HAVE_GL_2X
     362#if defined HAVE_GL_2X && !defined __APPLE__
    363363        glBindVertexArray(data->vao);
    364364#endif
     
    387387        glDrawArrays(GL_TRIANGLES, 0, (n - i) * 6);
    388388
    389 #if defined HAVE_GL_2X
     389#if defined HAVE_GL_2X && !defined __APPLE__
    390390        glBindVertexArray(0);
    391391#endif
Note: See TracChangeset for help on using the changeset viewer.