Skip to content

W
wine-cw
Commit 5557c71f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

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

parent ee1a5bd6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
tools/winegcc/winegcc.c
View file @ 5557c71f
...@@ -471,16 +471,18 @@ static void build(struct options* opts) ...@@ -471,16 +471,18 @@ static void build(struct options* opts)
else output_name = output_file; else output_name = output_file;
/* prepare the linking path */ /* prepare the linking path */
lib_dirs = strarray_dup(opts->lib_dirs);
if (!opts->wine_objdir) if (!opts->wine_objdir)
{ {
lib_dirs = strarray_dup(opts->lib_dirs);
for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ ) for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ )
strarray_add(lib_dirs, stdlibpath[j]); strarray_add(lib_dirs, stdlibpath[j]);
} }
else else
{ {
lib_dirs = strarray_alloc();
strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir)); strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir));
strarray_add(lib_dirs, strmake("%s/libs/wine", 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 */ /* mark the files with their appropriate type */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment