diff options
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index f50b3dd0d0..6d148e41a2 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -113,9 +113,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) qPrintable(variables["QMAKESPEC"].first().toQString())); return false; } - } -#ifdef Q_OS_WIN - else if (project->isActiveConfig(QStringLiteral("winrt"))) { + } else if (project->isActiveConfig(QStringLiteral("winrt"))) { QString arch = project->first("VCPROJ_ARCH").toQString().toLower(); QString compiler; QString compilerArch; @@ -143,6 +141,8 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) return false; } + const bool isPhone = project->isActiveConfig(QStringLiteral("winphone")); +#ifdef Q_OS_WIN QString regKeyPrefix; #if !defined(Q_OS_WIN64) && _WIN32_WINNT >= 0x0501 BOOL isWow64; @@ -160,7 +160,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) return false; } - const bool isPhone = project->isActiveConfig(QStringLiteral("winphone")); regKey = regKeyPrefix + (isPhone ? QStringLiteral("Microsoft\\Microsoft SDKs\\WindowsPhone\\v") : QStringLiteral("Microsoft\\Microsoft SDKs\\Windows\\v")) @@ -170,6 +169,10 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) fprintf(stderr, "Failed to find the Windows Kit installation directory.\n"); return false; } +#else + const QString vcInstallDir = "/fake/vc_install_dir"; + const QString kitDir = "/fake/sdk_install_dir"; +#endif // Q_OS_WIN QStringList incDirs; QStringList libDirs; @@ -209,7 +212,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) t << "\nLIB = " << nmakePathList(libDirs); t << "\nPATH = " << nmakePathList(binDirs) << '\n'; } -#endif // Q_OS_WIN } writeNmakeParts(t); return MakefileGenerator::writeMakefile(t); @@ -251,8 +253,10 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t) if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; - if(t == "target" && project->first("TEMPLATE") == "lib") { - if(project->isActiveConfig("shared") && project->isActiveConfig("debug")) { + if (project->isActiveConfig("debug")) { + if (t == "dlltarget" + || (project->first("TEMPLATE") == "lib" + && project->isActiveConfig("shared"))) { QString pdb_target = getPdbTarget(); pdb_target.remove('"'); QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target; |