[cwittich] 18577: revert 18576

revert 18576
fix rbuild instead
Modified: trunk/reactos/subsys/system/expand/expand.xml
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
  _____  

Modified: trunk/reactos/subsys/system/expand/expand.xml
--- trunk/reactos/subsys/system/expand/expand.xml	2005-10-18
23:00:31 UTC (rev 18576)
+++ trunk/reactos/subsys/system/expand/expand.xml	2005-10-18
23:25:46 UTC (rev 18577)
@@ -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" />
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-18 23:00:31 UTC (rev 18576)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-18 23:25:46 UTC (rev 18577)
@@ -105,10 +105,15 @@

 		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() );