[1/4] winemaker: Get rid of sub projects for project files

[André Hentschel]

---
 tools/winemaker |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 4e32fc1..ef18513 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -528,16 +528,14 @@ sub source_set_options($$)
 # - get a list of targets for this project
 # - get some settings
 # - get the list of source files
-sub source_scan_project_file($$$);
-sub source_scan_project_file($$$)
+sub source_scan_project_file($$);
+sub source_scan_project_file($$)
 {
     # a reference to the parent's project
     my $parent_project=$_[0];
-    # 0 if it is a single project, 1 if it is part of a workspace
-    my $is_sub_project=$_[1];
     # the name of the project file, with complete path, or without if in
     # the same directory
-    my $filename=$_[2];
+    my $filename=$_[1];
 
     # reference to the project for this file. May not be used
     my $project;
@@ -984,12 +982,6 @@ sub source_scan_project_file($$$)
         return;
     }
 
-    # Add this project to the project list, except for
-    # the main project which is already in the list.
-    if ($is_sub_project == 1) {
-        push @projects,$project;
-    }
-
     # Ask for project-wide options
     if ($opt_ask_project_options == $OPT_ASK_YES) {
         my $flag_desc="";
@@ -1192,7 +1184,7 @@ sub source_scan_workspace_file($)
                 @components=split /[\/\\]+/, $prj_path;
                 $prj_path=search_from($path, \@components);
                 print "Name: $prj_name\nPath: $prj_path\n";
-                source_scan_project_file(\@main_project,1,$prj_path);
+                source_scan_project_file(\@main_project,$prj_path);
                 next;
             } elsif (/^#/) {
                 # ignore Comments
@@ -1218,7 +1210,7 @@ sub source_scan_workspace_file($)
                 @components=split /[\/\\]+/, $3;
                 $prj_path=search_from($path, \@components);
                 print "Name: $prj_name\nPath: $prj_path\n";
-                source_scan_project_file(\@main_project,1,$prj_path);
+                source_scan_project_file(\@main_project,$prj_path);
                 next;
             } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) {
                 print "\nFileversion: $3\n";
@@ -1760,7 +1752,7 @@ sub source_scan()
         @projects=sort { @$a[$P_PATH] cmp @$b[$P_PATH] } @projects;
     } elsif (defined $opt_work_file) {
         if ($opt_work_file =~ /.dsp$/i or $opt_work_file =~ /.vcproj$/i) {
-            source_scan_project_file(\@main_project,0,$opt_work_file);
+            source_scan_project_file(\@main_project,$opt_work_file);
         } elsif ($opt_work_file =~ /.dsw$/i or $opt_work_file =~ /.sln$/i) {
             source_scan_workspace_file($opt_work_file);
         }
-- 
1.7.4.1



-- 

Best Regards, André Hentschel