diff options
| author | Iain <qt-info@nokia.com> | 2009-05-26 15:17:31 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-05-26 15:17:31 (GMT) |
| commit | 82f8c6fbc0006d08638a397941f170e2bee6460d (patch) | |
| tree | 3fc8b33e139a28d17482b9fe7bd349896cbd5ece /demos | |
| parent | 8d9b58cde5d1ad6c6684bcc3516cd3782b946bfc (diff) | |
| parent | 4998ad5f72314b48ad8c8115b64f4cb4b747c2bc (diff) | |
| download | Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.zip Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.tar.gz Qt-82f8c6fbc0006d08638a397941f170e2bee6460d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/boxes/glextensions.h | 7 | ||||
| -rw-r--r-- | demos/demos.pro | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h index 74617d6..7ba3b32 100644 --- a/demos/boxes/glextensions.h +++ b/demos/boxes/glextensions.h @@ -120,8 +120,11 @@ glUnmapBuffer //#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A #endif +#ifndef GL_ARB_vertex_buffer_object +typedef ptrdiff_t GLsizeiptrARB; +#endif + #ifndef GL_VERSION_1_5 -typedef ptrdiff_t GLsizeiptr; #define GL_ARRAY_BUFFER 0x8892 #define GL_ELEMENT_ARRAY_BUFFER 0x8893 #define GL_READ_WRITE 0x88BA @@ -185,7 +188,7 @@ typedef void (APIENTRY *_glTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *); typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint); -typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptr, const GLvoid *, GLenum); +typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptrARB, const GLvoid *, GLenum); typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *); typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum); typedef GLboolean (APIENTRY *_glUnmapBuffer) (GLenum); diff --git a/demos/demos.pro b/demos/demos.pro index 1c98b9e..3856591 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -35,7 +35,7 @@ contains(QT_BUILD_PARTS, tools):{ wince*: SUBDIRS += demos_sqlbrowser } } -contains(QT_CONFIG, phonon)!static:SUBDIRS += demos_mediaplayer +contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser # install |