diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-12-12 15:11:36 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 21:14:35 +0100 |
commit | 2433ee06efdcd93b55d7005a96b7e5f6783cefe6 (patch) | |
tree | 5cdc228b5bee1d2db2441caf37b06eab10d9d814 /tools | |
parent | 8f80ff338ee53a2e66e55fd04c39c883c5f2d031 (diff) |
Windows/Windows CE: Do not dynamically load shell32/coredll.
Those libraries are contained in QMAKE_LIBS_CORE and
GetSpecialFolderPath() is present in all supported versions.
Change-Id: Iae40714e0f234625b063aeb50e29fc79c4aaa6ea
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/Makefile.win32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index ff38ddcc76..2ec99d30b0 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -9,7 +9,7 @@ CXXFLAGS_BARE = -nologo -Zm200 -Zc:wchar_t -MT -W3 -GR -EHsc -w34100 -w34189 $(E CXXFLAGS = -FIconfigure_pch.h -Yuconfigure_pch.h -Fp$(PCH) -MP $(CXXFLAGS_BARE) LINK = link LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest" -LIBS = ole32.lib advapi32.lib +LIBS = ole32.lib advapi32.lib shell32.lib TARGET = ..\..\configure.exe |