Alexandre Julliard : winegcc: Make sure the Wine library paths take precedence in Wine mode.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 5557c71f7f60adc0b21c905c8cb62a5a9da5ca63
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5557c71f7f60adc0b21c905c8cb62a5a9da5ca63

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jul 17 14:07:11 2006 +0200

winegcc: Make sure the Wine library paths take precedence in Wine mode.

---

 tools/winegcc/winegcc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index e31d93d..ff38076 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -471,16 +471,18 @@ static void build(struct options* opts)
     else output_name = output_file;
 
     /* prepare the linking path */
-    lib_dirs = strarray_dup(opts->lib_dirs);
     if (!opts->wine_objdir)
     {
+        lib_dirs = strarray_dup(opts->lib_dirs);
 	for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ )
 	    strarray_add(lib_dirs, stdlibpath[j]);
     }
     else
     {
+        lib_dirs = strarray_alloc();
         strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir));
         strarray_add(lib_dirs, strmake("%s/libs/wine", opts->wine_objdir));
+        strarray_addall(lib_dirs, opts->lib_dirs);
     }
 
     /* mark the files with their appropriate type */