Skip to content

W
wine-cw
Commit 4f787812 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

winegcc: Add Wine include directories before standard directories on search list.

This is especially important for msvcrt headers, which need to be used instead of system ones. Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c7a210bc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
tools/winegcc/winegcc.c
View file @ 4f787812
...@@ -915,16 +915,17 @@ no_compat_defines: ...@@ -915,16 +915,17 @@ no_compat_defines:
} }
strarray_add(comp_args, "-D__MSVCRT__"); strarray_add(comp_args, "-D__MSVCRT__");
} }
if (includedir) if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
{ {
strarray_add( comp_args, strmake( "-I%s", includedir )); if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
} }
if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir ));
for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
{ {
if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] ));
strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
} }
} }
else if (opts->wine_objdir) else if (opts->wine_objdir)
......
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