revert 18576

fix rbuild instead

svn path=/trunk/; revision=18577

diff --git a/reactos/subsys/system/expand/expand.xml b/reactos/subsys/system/expand/expand.xml
index d3575be..316a2b1 100644 (file)
--- a/reactos/subsys/system/expand/expand.xml
+++ b/reactos/subsys/system/expand/expand.xml
@@ -1,4 +1,5 @@
 <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false">
+       <include base="ReactOS">include/wine</include>
        <include base="cmd">.</include>
        <define name="__USE_W32API" />
        <define name="ANONYMOUSUNIONS" />

diff --git a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
index 55d5443..7eebcab 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
@@ -105,10 +105,15 @@ MSVCBackend::_generate_dsp ( const Module& module )
                const vector<Include*>& incs = data.includes;
                for ( i = 0; i < incs.size(); i++ )
                {
+
                        // explicitly omit win32api directories
                        if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) )
                                continue;
 
+                       // explicitly omit include/wine directories
+                       if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) )
+                               continue;
+
                        string path = Path::RelativeFromDirectory (
                                incs[i]->directory,
                                module.GetBasePath() );