Commit 5a1d836d authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

winegcc: Use -idirafter for system include paths.

parent 92713253
...@@ -904,6 +904,7 @@ no_compat_defines: ...@@ -904,6 +904,7 @@ no_compat_defines:
const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" };
const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : "";
const char *isystem = gcc_defs ? "-isystem" : "-I"; const char *isystem = gcc_defs ? "-isystem" : "-I";
const char *idirafter = gcc_defs ? "-idirafter" : "-I";
if (opts->use_msvcrt) if (opts->use_msvcrt)
{ {
...@@ -915,17 +916,16 @@ no_compat_defines: ...@@ -915,17 +916,16 @@ no_compat_defines:
} }
strarray_add(comp_args, "-D__MSVCRT__"); strarray_add(comp_args, "-D__MSVCRT__");
} }
if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); if (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/wine/windows", isystem, includedir ));
strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); strarray_add( comp_args, strmake( "%s%s", idirafter, includedir ));
} }
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( "%s%s%s", isystem, root, incl_dirs[j] )); strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
strarray_add(comp_args, strmake( "%s%s%s", idirafter, 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