j_anderw@sbox.tugraz.at
authorGed Murphy <gedmurphy@reactos.org>
Wed, 14 Dec 2005 22:50:25 +0000 (22:50 +0000)
committerGed Murphy <gedmurphy@reactos.org>
Wed, 14 Dec 2005 22:50:25 +0000 (22:50 +0000)
list resource files in the correct directory within msvc

svn path=/trunk/; revision=20180

reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

index b62f796..e73fad1 100644 (file)
@@ -90,9 +90,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        //$progress_current++;\r
        //$output->progress("$dsp_file (file $progress_current of $progress_max)");\r
 \r
-       // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?\r
        string vcproj_path = module.GetBasePath();\r
-       vector<string> c_srcs, source_files, resource_files, includes, libraries, defines;\r
+       vector<string> source_files, resource_files, includes, libraries, defines;\r
        vector<const IfableData*> ifs_list;\r
        ifs_list.push_back ( &module.project.non_if_data );\r
        ifs_list.push_back ( &module.non_if_data );\r
@@ -117,9 +116,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                        // TODO FIXME - do we want the full path of the file here?\r
                        string file = string(".") + &files[i]->name[vcproj_path.size()];\r
 \r
-                       source_files.push_back ( file );\r
                        if ( !stricmp ( Right(file,2).c_str(), ".c" ) )\r
-                               c_srcs.push_back ( file );\r
+                               source_files.push_back ( file );\r
                        if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )\r
                                resource_files.push_back ( file );\r
                }\r
@@ -529,7 +527,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        fprintf ( OUT, "\t\t<Filter\r\n" );\r
        fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" );\r
        fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" );\r
-       for ( i = 0; i < header_files.size(); i++ )\r
+       for ( i = 0; i < resource_files.size(); i++ )\r
        {\r
                const string& resource_file = resource_files[i];\r
                fprintf ( OUT, "\t\t\t<File\r\n" );\r