=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Always use parent project for project files.

Alexandre Julliard julliard at winehq.org
Tue Oct 9 13:12:35 CDT 2012


Module: wine
Branch: master
Commit: 2c3121d5335055eb545f306a882fe61c585e5bee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c3121d5335055eb545f306a882fe61c585e5bee

Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Oct  8 23:45:27 2012 +0200

winemaker: Always use parent project for project files.

---

 tools/winemaker |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 58d6bfe..d23418d 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -562,15 +562,7 @@ sub source_scan_project_file($$$)
         $path.="/";
     }
 
-    if (defined $opt_single_target or $is_sub_project == 0) {
-        # Either there is a single target and thus a single project,
-        # or we are a single project-file for which a project
-        # already exists
-        $project=$parent_project;
-    } else {
-        $project=[];
-        project_init($project, $path, \@global_settings);
-    }
+    $project=$parent_project;
     my $project_settings=@$project[$P_SETTINGS];
 
     if ($filename =~ /.dsp$/i) {




More information about the wine-cvs mailing list