kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add define flags in the right place

This commit is contained in:
Bill Hoffman 2001-01-12 14:05:11 -05:00
parent 7ae5e97a3d
commit 85d16dbd35
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmDSPMakefile.cxx
View File

@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile()
} }
m_DebugLibraryOptions += "/STACK:10000000 "; m_DebugLibraryOptions += "/STACK:10000000 ";
// add any extra define flags // add any extra define flags
m_DebugLibraryOptions += m_Makefile->GetDefineFlags();
m_ReleaseLibraryOptions = m_DebugLibraryOptions; m_ReleaseLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
// If the output directory is not the m_cmHomeDirectory // If the output directory is not the m_cmHomeDirectory
// then create it. // then create it.
if(strcmp(m_Makefile->GetOutputDirectory(), if(strcmp(m_Makefile->GetOutputDirectory(),
@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout)
Die(message.c_str()); Die(message.c_str());
} }
char buffer[2048]; char buffer[2048];
while(fin) while(fin)
{ {
fin.getline(buffer, 2048); fin.getline(buffer, 2048);
@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout)
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",
m_Makefile->GetLibraryName()); m_Makefile->GetLibraryName());
cmSystemTools::ReplaceString(line, cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES", ""); "EXTRA_DEFINES",
m_Makefile->GetDefineFlags());
fout << line.c_str() << std::endl; fout << line.c_str() << std::endl;
} }
} }

6
Source/cmDSPWriter.cxx
View File

@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile()
} }
m_DebugLibraryOptions += "/STACK:10000000 "; m_DebugLibraryOptions += "/STACK:10000000 ";
// add any extra define flags // add any extra define flags
m_DebugLibraryOptions += m_Makefile->GetDefineFlags();
m_ReleaseLibraryOptions = m_DebugLibraryOptions; m_ReleaseLibraryOptions = m_DebugLibraryOptions;
cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release");
// If the output directory is not the m_cmHomeDirectory // If the output directory is not the m_cmHomeDirectory
// then create it. // then create it.
if(strcmp(m_Makefile->GetOutputDirectory(), if(strcmp(m_Makefile->GetOutputDirectory(),
@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout)
Die(message.c_str()); Die(message.c_str());
} }
char buffer[2048]; char buffer[2048];
while(fin) while(fin)
{ {
fin.getline(buffer, 2048); fin.getline(buffer, 2048);
@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout)
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",
m_Makefile->GetLibraryName()); m_Makefile->GetLibraryName());
cmSystemTools::ReplaceString(line, cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES", ""); "EXTRA_DEFINES",
m_Makefile->GetDefineFlags());
fout << line.c_str() << std::endl; fout << line.c_str() << std::endl;
} }
} }