diff options
| author | con <qtc-committer@nokia.com> | 2011-03-31 15:53:10 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-04-05 09:01:50 (GMT) |
| commit | f3d82a8903b14bb35b0b5f0eb69168b2ca59c31b (patch) | |
| tree | 9cdfabebeb91d059ae61c1a02558f1a7d9c6c9a3 /config.tests | |
| parent | 25054c7a20a6ebd15603ac1060e09ee244afa054 (diff) | |
| download | Qt-f3d82a8903b14bb35b0b5f0eb69168b2ca59c31b.zip Qt-f3d82a8903b14bb35b0b5f0eb69168b2ca59c31b.tar.gz Qt-f3d82a8903b14bb35b0b5f0eb69168b2ca59c31b.tar.bz2 | |
Compile fixes for GL ES and Mac
For QPA the unix tests are used to determine the availability of OpenGL
ES, so they need to compile even on Mac. Similarly the includes in the
OpenGL module have to be adapted on Mac.
Acked-by: Jørgen Lind
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/opengles1/opengles1.cpp | 6 | ||||
| -rw-r--r-- | config.tests/unix/opengles1/opengles1.pro | 4 | ||||
| -rw-r--r-- | config.tests/unix/opengles2/opengles2.cpp | 6 | ||||
| -rw-r--r-- | config.tests/unix/opengles2/opengles2.pro | 4 |
4 files changed, 18 insertions, 2 deletions
diff --git a/config.tests/unix/opengles1/opengles1.cpp b/config.tests/unix/opengles1/opengles1.cpp index caef9a9..ec16fc0 100644 --- a/config.tests/unix/opengles1/opengles1.cpp +++ b/config.tests/unix/opengles1/opengles1.cpp @@ -39,7 +39,11 @@ ** ****************************************************************************/ -#include <GLES/gl.h> +#ifdef BUILD_ON_MAC + #include <OpenGLES/ES1/gl.h> +#else + #include <GLES/gl.h> +#endif int main(int, char **) { diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro index 1469aa9..9e60124 100644 --- a/config.tests/unix/opengles1/opengles1.pro +++ b/config.tests/unix/opengles1/opengles1.pro @@ -7,3 +7,7 @@ for(p, QMAKE_LIBDIR_OPENGL_ES1) { CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL_ES1 +mac { + DEFINES += BUILD_ON_MAC + CONFIG -= app_bundle +} diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp index caf02e6..39c6fa7 100644 --- a/config.tests/unix/opengles2/opengles2.cpp +++ b/config.tests/unix/opengles2/opengles2.cpp @@ -39,7 +39,11 @@ ** ****************************************************************************/ -#include <GLES2/gl2.h> +#ifdef BUILD_ON_MAC + #include <OpenGLES/ES2/gl.h> +#else + #include <GLES2/gl2.h> +#endif int main(int, char **) { diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro index c383fd0..34d7737 100644 --- a/config.tests/unix/opengles2/opengles2.pro +++ b/config.tests/unix/opengles2/opengles2.pro @@ -7,3 +7,7 @@ for(p, QMAKE_LIBDIR_OPENGL_ES2) { CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL_ES2 +mac { + DEFINES += BUILD_ON_MAC + CONFIG -= app_bundle +} |