diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-06-10 12:35:05 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 12:35:05 (GMT) |
| commit | b65a1e0be447abca16f20001efe1be43a0469808 (patch) | |
| tree | f60e796b135030fbb734b8251b5e2deba3f5fd38 /config.tests/x11 | |
| parent | 0d5649713af91dcce58a623bbef7d38e2fbdf13b (diff) | |
| download | Qt-b65a1e0be447abca16f20001efe1be43a0469808.zip Qt-b65a1e0be447abca16f20001efe1be43a0469808.tar.gz Qt-b65a1e0be447abca16f20001efe1be43a0469808.tar.bz2 | |
support for cross building Qt for MinGW (win32-g++) on Unix
This changeset provides the basis for targetting win32-g++ on Unix using
the configure shell script:
support added to the configure script itself
support added to relevant config.tests
support added to mingw makefile generator in qmake
new makespec: unsupported/win32-g++-cross
The makespec is based on the win32-g++ makespec.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'config.tests/x11')
| -rw-r--r-- | config.tests/x11/opengl/opengl.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro index 432bd8d..5fd41d3 100644 --- a/config.tests/x11/opengl/opengl.pro +++ b/config.tests/x11/opengl/opengl.pro @@ -7,4 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += -lGL -lGLU +win32-g++*:LIBS += -lopengl32 +else:LIBS += -lGL -lGLU |