Skip to content

W
wine-winehq
Commit 683e4554 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winegcc: Always search the standard include dirs.

By analogy with the library dir search. Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 08956bc9
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 5 deletions
tools/winegcc/winegcc.c
View file @ 683e4554
......@@ -804,16 +804,26 @@ no_compat_defines:
/* standard includes come last in the include search path */
if (!opts->wine_objdir && !opts->nostdinc)
{
const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" };
const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : "";
if (opts->use_msvcrt)
{
strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt",
gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR ));
for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
{
if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt",
gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] ));
}
strarray_add(comp_args, "-D__MSVCRT__");
}
strarray_add(comp_args, strmake( "-I%s%s", root, INCLUDEDIR ));
strarray_add(comp_args, strmake( "%s%s%s/wine/windows",
gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR ));
for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
{
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/wine/windows",
gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] ));
}
}
else if (opts->wine_objdir)
strarray_add(comp_args, strmake("-I%s/include", 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