<include> now has attribute 'base' which allows to specify subdirectory of another...

[reactos.git] / reactos / tools / rbuild / backend / mingw / modulehandler.cpp

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index e3fadca..d0832dd 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -140,8 +140,7 @@ MingwModuleHandler::ConcatenatePaths ( const string& path1,
 }\r
 \r
 string\r
-MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& basePath,\r
-                                                                const vector<Include*>& includes ) const\r
+MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const\r
 {\r
        string parameters;\r
        for (size_t i = 0; i < includes.size (); i++)\r
@@ -149,9 +148,7 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& baseP
                Include& include = *includes[i];\r
                if (parameters.length () > 0)\r
                        parameters += " ";\r
-               parameters += "-I";\r
-               parameters += ConcatenatePaths ( basePath,\r
-                                                include.directory );\r
+               parameters += "-I" + include.directory;\r
        }\r
        return parameters;\r
 }\r
@@ -159,10 +156,8 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& baseP
 string\r
 MingwModuleHandler::GenerateGccIncludeParameters ( const Module& module ) const\r
 {\r
-       string parameters = GenerateGccIncludeParametersFromVector ( ".",\r
-                                                                    module.project.includes );\r
-       string s = GenerateGccIncludeParametersFromVector ( module.path,\r
-                                                           module.includes );\r
+       string parameters = GenerateGccIncludeParametersFromVector ( module.project.includes );\r
+       string s = GenerateGccIncludeParametersFromVector ( module.includes );\r
        if (s.length () > 0)\r
        {\r
                parameters += " ";\r