You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/10/31 15:54:35 UTC
svn commit: r590689 -
/incubator/stdcxx/trunk/etc/config/windows/projectdef.js
Author: faridz
Date: Wed Oct 31 07:54:34 2007
New Revision: 590689
URL: http://svn.apache.org/viewvc?rev=590689&view=rev
Log:
2007-10-31 Farid Zaripov <fa...@epam.com>
Merged r590686 from branches/4.2.x
* projectdef.js (projectCreateVCProject): Generate source pdb
in OutDir only for static libraries. For the other projects
generate the binary pdb in OutDir, and source pdb in IntDir.
Modified:
incubator/stdcxx/trunk/etc/config/windows/projectdef.js
Modified: incubator/stdcxx/trunk/etc/config/windows/projectdef.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projectdef.js?rev=590689&r1=590688&r2=590689&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Wed Oct 31 07:54:34 2007
@@ -440,7 +440,13 @@
if (null != this.PrepOpts)
compiler.GeneratePreprocessedFile = this.PrepOpts;
compiler.DebugInformationFormat = debugEnabled;
- compiler.ProgramDataBaseFileName = changeFileExt(OutFile, "pdb");
+
+ if (typeStaticLibrary == conf.ConfigurationType)
+ {
+ // generate the source pdb in the OutDir
+ compiler.ProgramDataBaseFileName = changeFileExt(OutFile, "pdb");
+ }
+
compiler.SuppressStartupBanner = true;
compiler.WarningLevel = warningLevel_3;
setProperty(compiler.Detect64BitPortabilityProblems, false);
@@ -510,8 +516,7 @@
linker.LinkIncremental = linkIncrementalNo;
linker.SuppressStartupBanner = true;
linker.GenerateDebugInformation = true;
- // use the compiler's .pdb
- linker.ProgramDatabaseFile = "";
+ linker.ProgramDatabaseFile = changeFileExt(OutFile, "pdb");
linker.IgnoreDefaultLibraryNames = IngoreLibs;
linker.SubSystem = this.SubSystem;