ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegcc: Use -idirafter for system include paths. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50996
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-04-22 18:30:52 +02:00 committed by Alexandre Julliard
parent 92713253ab
commit 5a1d836def
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/winegcc/winegcc.c
View File

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