Ignore:
Timestamp:
May 19, 2012, 2:42:33 AM (10 years ago)
Author:
sam
Message:

core: no longer deactivate std::ostream features on Android.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gpu/vertexbuffer.cpp

    r1337 r1401  
    4747#elif defined _XBOX
    4848    D3DVertexBuffer *m_vbo;
    49 #elif !defined __ANDROID__
     49#else
    5050    GLuint m_vbo;
    5151    uint8_t *m_memory;
     
    474474                                               D3DPOOL_MANAGED, &m_data->m_vbo, NULL)))
    475475        Abort();
    476 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__
     476#elif !defined __CELLOS_LV2__
    477477    glGenBuffers(1, &m_data->m_vbo);
    478478    m_data->m_memory = new uint8_t[size];
     
    486486    if (FAILED(m_data->m_vbo->Release()))
    487487        Abort();
    488 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__
     488#elif !defined __CELLOS_LV2__
    489489    glDeleteBuffers(1, &m_data->m_vbo);
    490490    delete[] m_data->m_memory;
     
    500500        Abort();
    501501    return ret;
    502 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__
     502#elif !defined __CELLOS_LV2__
    503503    return m_data->m_memory + offset;
    504504#endif
     
    510510    if (FAILED(m_data->m_vbo->Unlock()))
    511511        Abort();
    512 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__
     512#elif !defined __CELLOS_LV2__
    513513    glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
    514514    glBufferData(GL_ARRAY_BUFFER, m_data->m_size, m_data->m_memory,
Note: See TracChangeset for help on using the changeset viewer.