diff options
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index c08cd66..ea13277 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -982,23 +982,27 @@ void cmLocalVisualStudio6Generator } else { - libMultiLineOptions += "# ADD LINK32 /out:\""; if(exePath != "") + { libMultiLineOptions += exePath + "/" + libName + ".exe"; + } else + { libMultiLineOptions += std::string(libName) + ".exe"; - + } libMultiLineOptions += "\"\n"; - - libMultiLineOptionsForDebug += "# ADD LINK32 /out:\""; - if(exePath != "") - libMultiLineOptionsForDebug += exePath + "/" + libName + "D.exe"; + { + libMultiLineOptionsForDebug += exePath + "$(INTDIR)/" + libName + "D.exe"; + } else - libMultiLineOptionsForDebug += std::string(libName) + "D.exe"; + { + libMultiLineOptionsForDebug += std::string("$(INTDIR)/") + + std::string(libName) + "D.exe"; + } libMultiLineOptionsForDebug += "\"\n"; } |