diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-01 09:41:42 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-01 09:43:20 (GMT) |
| commit | 92fa816cd145ab156aa15bdd699504c97884dba7 (patch) | |
| tree | e57465487d8ee169b1051e7059b4cc8172b63123 /mkspecs/win32-g++ | |
| parent | 5180e192c2fdb7735aa062e35179415de40834a2 (diff) | |
| download | Qt-92fa816cd145ab156aa15bdd699504c97884dba7.zip Qt-92fa816cd145ab156aa15bdd699504c97884dba7.tar.gz Qt-92fa816cd145ab156aa15bdd699504c97884dba7.tar.bz2 | |
link glu32 before opengl32
otherwise the build fails if the libraries are statically built, as glu
depends on opengl.
Task-number: QTBUG-11863
Diffstat (limited to 'mkspecs/win32-g++')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 8881d02..ec216aa 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -68,7 +68,7 @@ QMAKE_LIBS = QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 QMAKE_LIBS_NETWORK = -lws2_32 -QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 +QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |