fix path to msvc def file
authorChristoph von Wittich <christoph_vw@reactos.org>
Wed, 27 Feb 2008 12:27:45 +0000 (12:27 +0000)
committerChristoph von Wittich <christoph_vw@reactos.org>
Wed, 27 Feb 2008 12:27:45 +0000 (12:27 +0000)
svn path=/trunk/; revision=32507

reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

index 79295a4..8f3316b 100644 (file)
@@ -274,6 +274,9 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        {
                intermediatedir = module.output->relative_path + vcdir;
                importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir);
        {
                intermediatedir = module.output->relative_path + vcdir;
                importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir);
+               importLib = Path::RelativeFromDirectory (
+                               importLib,
+                               module.output->relative_path );
        }
 
        fprintf ( OUT, "\t<Configurations>\r\n" );
        }
 
        fprintf ( OUT, "\t<Configurations>\r\n" );
@@ -854,8 +857,8 @@ MSVCBackend::_strip_gcc_deffile(std::string Filename, std::string sourcedir, std
        NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def");
        Filename = sourcedir + "\\" + Filename;
 
        NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def");
        Filename = sourcedir + "\\" + Filename;
 
-    Directory dir(objdir);
-    dir.GenerateTree(IntermediateDirectory, false);
+       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);
 
        std::fstream in_file(Filename.c_str(), std::ios::in);
        std::fstream out_file(NewFilename.c_str(), std::ios::out);