Alexandre Julliard : winegcc: Pass all option flags to winebuild before non-options filenames.

Alexandre Julliard julliard at winehq.org
Mon Jun 29 09:17:44 CDT 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 29 13:13:25 2009 +0200

winegcc: Pass all option flags to winebuild before non-options filenames.

---

 tools/winegcc/winegcc.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index c2fb4f3..b337630 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -830,18 +830,20 @@ static void build(struct options* opts)
     for ( j = 0 ; j < opts->winebuild_args->size ; j++ )
         strarray_add(spec_args, opts->winebuild_args->base[j]);
 
+    /* add resource files */
+    for ( j = 0; j < files->size; j++ )
+	if (files->base[j][1] == 'r') strarray_add(spec_args, files->base[j]);
+
+    /* add other files */
+    strarray_add(spec_args, "--");
     for ( j = 0; j < files->size; j++ )
     {
-	const char* name = files->base[j] + 2;
 	switch(files->base[j][1])
 	{
-	    case 'r':
-		strarray_add(spec_args, files->base[j]);
-		break;
 	    case 'd':
 	    case 'a':
 	    case 'o':
-		strarray_add(spec_args, name);
+		strarray_add(spec_args, files->base[j] + 2);
 		break;
 	}
     }




More information about the wine-cvs mailing list