Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- pass the correct path to _strip_gcc_deffile

Browse source 
- automatically create directories for converted def files
- fixes auto-def file generation

svn path=/trunk/; revision=32320
This commit is contained in:
Johannes Anderwald 2008-02-12 12:18:23 +00:00
parent 17e045e905
commit dd25d44880
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -272,7 +272,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
// don't do the work m_configurations.size() times // don't do the work m_configurations.size() times
if (module.importLibrary != NULL) if (module.importLibrary != NULL)
{ {
intermediatedir = intdir + "\\" + module.output->relative_path + vcdir; intermediatedir = module.output->relative_path + vcdir;
importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir); importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir);
} }
@ -848,12 +848,15 @@ MSVCBackend::_generate_vcproj ( const Module& module )
std::string std::string
MSVCBackend::_strip_gcc_deffile(std::string Filename, std::string sourcedir, std::string objdir) MSVCBackend::_strip_gcc_deffile(std::string Filename, std::string sourcedir, std::string objdir)
{ {
std::string NewFilename = objdir + "\\" + Filename; std::string NewFilename = Environment::GetIntermediatePath () + "\\" + objdir + "\\" + Filename;
// we don't like infinite loops - so replace it in two steps // we don't like infinite loops - so replace it in two steps
NewFilename = _replace_str(NewFilename, ".def", "_msvc.de"); NewFilename = _replace_str(NewFilename, ".def", "_msvc.de");
NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def"); NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def");
Filename = sourcedir + "\\" + Filename; Filename = sourcedir + "\\" + Filename;
Directory dir(objdir);
dir.GenerateTree(IntermediateDirectory, false);
std::fstream in_file(Filename.c_str(), std::ios::in); std::fstream in_file(Filename.c_str(), std::ios::in);
std::fstream out_file(NewFilename.c_str(), std::ios::out); std::fstream out_file(NewFilename.c_str(), std::ios::out);
std::string::size_type pos; std::string::size_type pos;