Author: janderwald Date: Tue Feb 12 15:18:23 2008 New Revision: 32320
URL: http://svn.reactos.org/svn/reactos?rev=32320&view=rev Log: - pass the correct path to _strip_gcc_deffile - automatically create directories for converted def files - fixes auto-def file generation
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v... ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue Feb 12 15:18:23 2008 @@ -272,7 +272,7 @@ // don't do the work m_configurations.size() times 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); }
@@ -848,11 +848,14 @@ std::string 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 NewFilename = _replace_str(NewFilename, ".def", "_msvc.de"); NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def"); Filename = sourcedir + "\" + Filename; + + Directory dir(objdir); + dir.GenerateTree(IntermediateDirectory, false);
std::fstream in_file(Filename.c_str(), std::ios::in); std::fstream out_file(NewFilename.c_str(), std::ios::out);