diff options
Diffstat (limited to 'Source/cmNMakeMakefileGenerator.cxx')
-rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index ab43d2e..3ac21c1 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -48,9 +48,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "cmGeneratedFileStream.h" #include "windows.h" + +cmNMakeMakefileGenerator::cmNMakeMakefileGenerator() +{ + m_LibraryPathOption = "-LIBPATH:"; + this->SetObjectFileExtension(".obj"); + this->SetExecutableExtension(".exe"); + this->SetLibraryPrefix(""); + this->SetSharedLibraryExtension(".dll"); + this->SetStaticLibraryExtension(".lib"); + m_QuoteNextCommand = true; // most of the time command should be quoted +} + +cmNMakeMakefileGenerator::~cmNMakeMakefileGenerator() +{ +} + // convert to windows short paths if there are spaces // in path -inline std::string ShortPath(const char* path) +std::string cmNMakeMakefileGenerator::ShortPath(const char* path) { std::string ret = path; // if there are no spaces in path, then just return path @@ -80,7 +96,7 @@ inline std::string ShortPath(const char* path) // convert a command to a short path if it has spaces // this separates the arguments from the command and puts // them back together -inline std::string ShortPathCommand(const char* command) +std::string cmNMakeMakefileGenerator::ShortPathCommand(const char* command) { if(!strchr(command, ' ')) { @@ -105,21 +121,6 @@ inline std::string ShortPathCommand(const char* command) } -cmNMakeMakefileGenerator::cmNMakeMakefileGenerator() -{ - this->SetObjectFileExtension(".obj"); - this->SetExecutableExtension(".exe"); - this->SetLibraryPrefix(""); - this->SetSharedLibraryExtension(".dll"); - this->SetStaticLibraryExtension(".lib"); - m_QuoteNextCommand = true; // most of the time command should be quoted -} - -cmNMakeMakefileGenerator::~cmNMakeMakefileGenerator() -{ -} - - void cmNMakeMakefileGenerator::ComputeSystemInfo() { // now load the settings @@ -480,7 +481,7 @@ void cmNMakeMakefileGenerator::OutputLinkLibraries(std::ostream& fout, std::string libpath = ShortPath(libDir->c_str()); if(emitted.insert(libpath).second) { - linkLibs += "-LIBPATH:"; + linkLibs += m_LibraryPathOption; linkLibs += libpath; linkLibs += " "; } |