summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-18 21:39:43 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 09:15:17 +0100
commitc419cd1c300fa52df7dbe91906f7269da156859f (patch)
tree6afd2714bfead3012d39ab6137374b398667c336
parenta5f6536d9fbde11796d3c7f1a9db3fd34e83c2a5 (diff)
make compiler use the project's pdb file
this avoids the nasty and conflicting vcXX0.pdb files in the build dirs. VS will already do that. Change-Id: I7bddaecf3f478edc78cd6654b5a1038db4fe04ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 2a2e6b93ca..0abbd133cc 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -391,12 +391,14 @@ void NmakeMakefileGenerator::init()
project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp");
}
if (project->isActiveConfig("debug_info")) {
- project->values("QMAKE_DISTCLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb");
- project->values("QMAKE_CLEAN").append("vc*.pdb");
+ QString pdbfile = project->first("DESTDIR") + project->first("TARGET") + version + ".pdb";
+ project->values("QMAKE_CFLAGS").append("/Fd" + pdbfile);
+ project->values("QMAKE_CXXFLAGS").append("/Fd" + pdbfile);
+ project->values("QMAKE_DISTCLEAN").append(pdbfile);
}
if (project->isActiveConfig("debug")) {
project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
- project->values("QMAKE_CLEAN").append("vc*.idb");
+ project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".idb");
} else {
ProStringList &defines = project->values("DEFINES");
if (!defines.contains("NDEBUG"))