[ros-diffs] [cwittich] 18572: changed windres back to rc

changed windres back to rc
fixed rc preprocessor defines in dsp file generation
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
Modified: trunk/reactos/tools/rbuild/rbuild.cpp
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-18 21:41:45 UTC (rev 18571)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-18 21:56:39 UTC (rev 18572)
@@ -250,7 +250,7 @@

 	fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" );
 	fprintf ( OUT, "CPP=cl.exe\r\n" );
 	if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );
-	fprintf ( OUT, "RSC=windres.exe\r\n" );
+	fprintf ( OUT, "RSC=rc.exe\r\n" );
 
 	int n = 0;
 
@@ -481,6 +481,11 @@
 					fprintf ( OUT, " /i \"%s\"",
includes[i].c_str() );
 				}
 			}
+
+			for ( i = 0; i < defines.size(); i++ )
+			{
+				fprintf ( OUT, " /D \"%s\"",
defines[i].c_str() );
+			}
 			fprintf ( OUT, " /d \"_DEBUG\"\r\n" );
 		}
 		else
@@ -498,6 +503,13 @@
 				for ( i = 0; i < includes.size(); i++ )
 					fprintf ( OUT, " /i \"%s\"",
includes[i].c_str() );
 			}
+
+			for ( i = 0; i < defines.size(); i++ )
+			{
+				fprintf ( OUT, " /D \"%s\"",
defines[i].c_str() );
+			}
+
+
 			fprintf ( OUT, "/d \"NDEBUG\"\r\n" );
 		}
 		fprintf ( OUT, "BSC32=bscmake.exe\r\n" );
  _____  

Modified: trunk/reactos/tools/rbuild/rbuild.cpp
--- trunk/reactos/tools/rbuild/rbuild.cpp	2005-10-18 21:41:45 UTC
(rev 18571)
+++ trunk/reactos/tools/rbuild/rbuild.cpp	2005-10-18 21:56:39 UTC
(rev 18572)
@@ -151,6 +151,7 @@

 	{
 		printf ( "Generates project files for buildsystems\n\n"
);
 		printf ( "  rbuild [switches] buildsystem\n" );
+		printf ( "  rbuild msvc\n" );
 		printf ( "Switches:\n" );
 		printf ( "  -v            Be verbose.\n" );
 		printf ( "  -c            Clean as you go. Delete
generated files as soon as they are not\n" );
@@ -163,9 +164,10 @@
 		printf ( "  -ps           Generate proxy makefiles in
source tree instead of the output.\n" );
 		printf ( "                tree.\n" );
 		printf ( "\n" );
-		printf ( "  buildsystem  Target build system. Can be one
of:\n" );
+		printf ( "  buildsystem   Target build system. Can be
one of:\n" );
 		printf ( "                 mingw   MinGW\n" );
-		printf ( "                 devcpp  DevC++\n" );
+		printf ( "                 devcpp  DevC++\n\n" );
+		printf ( "  msvc          Generates dsp files for MSVC"
);
 		return 1;
 	}
 	try