diff options
author | David Faure <faure@kde.org> | 2009-07-14 22:24:41 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-07-14 22:24:53 (GMT) |
commit | 05e3dc0d340934c681501e8d47b787ff4e68d32c (patch) | |
tree | b09170b90442c0529224439014e4a012adeabaca /tools | |
parent | b2dbbb15ab7f61f63b54c176bf2467760240b00c (diff) | |
download | Qt-05e3dc0d340934c681501e8d47b787ff4e68d32c.zip Qt-05e3dc0d340934c681501e8d47b787ff4e68d32c.tar.gz Qt-05e3dc0d340934c681501e8d47b787ff4e68d32c.tar.bz2 |
Improve error message from configure.exe when trying to compile the Windows phonon backend:
- mention the DirectShow SDK, not the DirectX SDK (which doesn't include DirectShow anymore)
- mention which exact files were not found, rather than just "all required files couldn't be found"
Merge-request: 881
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 985c317..a899adb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1858,8 +1858,14 @@ bool Configure::checkAvailability(const QString &part) if (!available) { cout << "All the required DirectShow/Direct3D files couldn't be found." << endl - << "Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed." << endl - << "If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\\SetEnv.Cmd script." << endl; + << "Make sure you have either the platform SDK AND the DirectShow SDK or the Windows SDK installed." << endl + << "If you have the DirectShow SDK installed, please make sure that you have run the <path to SDK>\\SetEnv.Cmd script." << endl; + if (!findFile("vmr9.h")) cout << "vmr9.h not found" << endl; + if (!findFile("dshow.h")) cout << "dshow.h not found" << endl; + if (!findFile("strmiids.lib")) cout << "strmiids.lib not found" << endl; + if (!findFile("dmoguids.lib")) cout << "dmoguids.lib not found" << endl; + if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl; + if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl; } } else if (part == "WEBKIT") { available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++"); |