From 85d16dbd3568f2d21c2fc94284a33b093358ef4a Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 12 Jan 2001 14:05:11 -0500 Subject: [PATCH] ENH: add define flags in the right place --- Source/cmDSPMakefile.cxx | 6 +++--- Source/cmDSPWriter.cxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index 6c0784bd8..0687c7334 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile() } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags - m_DebugLibraryOptions += m_Makefile->GetDefineFlags(); m_ReleaseLibraryOptions = m_DebugLibraryOptions; cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); - // If the output directory is not the m_cmHomeDirectory // then create it. if(strcmp(m_Makefile->GetOutputDirectory(), @@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) Die(message.c_str()); } char buffer[2048]; + while(fin) { fin.getline(buffer, 2048); @@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", m_Makefile->GetLibraryName()); cmSystemTools::ReplaceString(line, - "EXTRA_DEFINES", ""); + "EXTRA_DEFINES", + m_Makefile->GetDefineFlags()); fout << line.c_str() << std::endl; } } diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 6c0784bd8..0687c7334 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile() } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags - m_DebugLibraryOptions += m_Makefile->GetDefineFlags(); m_ReleaseLibraryOptions = m_DebugLibraryOptions; cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); - // If the output directory is not the m_cmHomeDirectory // then create it. if(strcmp(m_Makefile->GetOutputDirectory(), @@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) Die(message.c_str()); } char buffer[2048]; + while(fin) { fin.getline(buffer, 2048); @@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", m_Makefile->GetLibraryName()); cmSystemTools::ReplaceString(line, - "EXTRA_DEFINES", ""); + "EXTRA_DEFINES", + m_Makefile->GetDefineFlags()); fout << line.c_str() << std::endl; } }