[hpoussin] 29602: Update msvc backend, so Colin Finck will maybe stop complaining...

Author: hpoussin
Date: Mon Oct 15 17:43:51 2007
New Revision: 29602

URL: http://svn.reactos.org/svn/reactos?rev=29602&view=rev
Log:
Update msvc backend, so Colin Finck will maybe stop complaining...

Modified:
    trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
    trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
    trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m...
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Mon Oct 15 17:43:51 2007
@@ -29,7 +29,6 @@
 #include <vector>

#include "msvc.h"
-#include "../mingw/mingw.h"

using std::string;
 using std::vector;

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m...
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Oct 15 17:43:51 2007
@@ -121,15 +121,6 @@
    	const vector<Include*>& incs = data.includes;
    	for ( i = 0; i < incs.size(); i++ )
    	{
-
-			// explicitly omit win32api directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "w32api", 6 ) )
-				continue;
-
-			// explicitly omit include/wine directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\wine", 12 ) )
-				continue;
-
    		string path = Path::RelativeFromDirectory (
    			incs[i]->directory->relative_path,
    			module.output->relative_path );

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 Mon Oct 15 17:43:51 2007
@@ -187,15 +187,16 @@
    				continue;
    			}
    		}
-			// add to another list win32api and include/wine directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\ddk", 11 ) ||
-			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\crt", 11 ) ||
+			// switch between general headers and ros headers
+			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\crt", 11 ) ||
+			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\ddk", 11 ) ||
    		     !strncmp(incs[i]->directory->relative_path.c_str(), "include\GL", 10 ) ||
-				 !strncmp(incs[i]->directory->relative_path.c_str(), "include\ddk", 11 ) ||
-				 !strncmp(incs[i]->directory->relative_path.c_str(), "include\psdk", 12 ) ||
+			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\psdk", 12 ) ||
    		     !strncmp(incs[i]->directory->relative_path.c_str(), "include\reactos\wine", 20 ) )
    		{
-				includes_ros.push_back ( path );
+				if (strncmp(incs[i]->directory->relative_path.c_str(), "include\crt", 11 ))
+					// not crt include
+					includes_ros.push_back ( path );
    		}
    		else
    		{
@@ -226,11 +227,11 @@
    			baseaddr = prop.value;
    	}
    }
-    /* include intermediate path for reactos.rc */
-    string version = intdir + "\include\reactos";
-    includes.push_back (version);
-	
-    string include_string;
+	/* include intermediate path for reactos.rc */
+	string version = intdir + "\include\reactos";
+	includes.push_back (version);
+
+	string include_string;

fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" );
    fprintf ( OUT, "<VisualStudioProject\r\n" );