diff options
| -rw-r--r-- | tools/configure/environment.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 2d44bdbbf6..8317043743 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -599,9 +599,10 @@ QStringList Environment::headerPaths(Compiler compiler) foreach (const QFileInfo &version, mingwLibDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) headerPaths += version.absoluteFilePath() + QLatin1String("/include"); } - } else { - headerPaths = splitPathList(QString::fromLocal8Bit(getenv("INCLUDE"))); } + // MinGW: Although gcc doesn't care about INCLUDE, qmake automatically adds it via -I + headerPaths += splitPathList(QString::fromLocal8Bit(getenv("INCLUDE"))); + // Add Direct X SDK for ANGLE const QString directXSdk = detectDirectXSdk(); if (!directXSdk.isEmpty()) // Add Direct X SDK for ANGLE @@ -614,9 +615,10 @@ QStringList Environment::libraryPaths(Compiler compiler) QStringList libraryPaths; if (compiler == CC_MINGW) { libraryPaths = mingwPaths(detectMinGW(), "lib"); - } else { - libraryPaths = splitPathList(QString::fromLocal8Bit(qgetenv("LIB"))); } + // MinGW: Although gcc doesn't care about LIB, qmake automatically adds it via -L + libraryPaths += splitPathList(QString::fromLocal8Bit(qgetenv("LIB"))); + // Add Direct X SDK for ANGLE const QString directXSdk = detectDirectXSdk(); if (!directXSdk.isEmpty()) { |