diff options
| -rw-r--r-- | Source/cmDSPMakefile.cxx | 15 | ||||
| -rw-r--r-- | Source/cmDSPWriter.cxx | 15 |
2 files changed, 24 insertions, 6 deletions
diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index 3c2969c..c54d1a3 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -443,19 +443,28 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName, { libOptions += " "; libOptions += j->first; - libOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libOptions += ".lib "; + } } if (j->second == cmTarget::DEBUG) { libDebugOptions += " "; libDebugOptions += j->first; - libDebugOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libDebugOptions += ".lib "; + } } if (j->second == cmTarget::OPTIMIZED) { libOptimizedOptions += " "; libOptimizedOptions += j->first; - libOptimizedOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libOptimizedOptions += ".lib "; + } } } } diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 3c2969c..c54d1a3 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -443,19 +443,28 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName, { libOptions += " "; libOptions += j->first; - libOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libOptions += ".lib "; + } } if (j->second == cmTarget::DEBUG) { libDebugOptions += " "; libDebugOptions += j->first; - libDebugOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libDebugOptions += ".lib "; + } } if (j->second == cmTarget::OPTIMIZED) { libOptimizedOptions += " "; libOptimizedOptions += j->first; - libOptimizedOptions += ".lib "; + if(j->first.find(".lib") == std::string::npos) + { + libOptimizedOptions += ".lib "; + } } } } |