summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-icc
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-01 09:41:42 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-01 09:43:20 (GMT)
commit92fa816cd145ab156aa15bdd699504c97884dba7 (patch)
treee57465487d8ee169b1051e7059b4cc8172b63123 /mkspecs/win32-icc
parent5180e192c2fdb7735aa062e35179415de40834a2 (diff)
downloadQt-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-icc')
-rw-r--r--mkspecs/win32-icc/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index acff5e1..3ae18b6 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -63,7 +63,7 @@ QMAKE_LIBS =
QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
QMAKE_LIBS_NETWORK = ws2_32.lib
-QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.lib
+QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib delayimp.lib
QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
QMAKE_LIBS_QT_ENTRY = -lqtmain