changed windres back to rc

fixed rc preprocessor defines in dsp file generation

svn path=/trunk/; revision=18572

diff --git a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
index b9836ba..55d5443 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
@@ -250,7 +250,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
        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 @@ MSVCBackend::_generate_dsp ( const Module& module )
                                        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 @@ MSVCBackend::_generate_dsp ( const Module& module )
                                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" );

diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp
index fc7d448..25810bc 100644 (file)
--- a/reactos/tools/rbuild/rbuild.cpp
+++ b/reactos/tools/rbuild/rbuild.cpp
@@ -151,6 +151,7 @@ main ( int argc, char** argv )
        {
                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 @@ main ( int argc, char** argv )
                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