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

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: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-04-06 00:36:41 +02:00 committed by Alexandre Julliard
parent c7a210bc2f
commit 4f78781299
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/winegcc/winegcc.c
View File

@ -915,17 +915,18 @@ 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 ));
{
strarray_add( comp_args, strmake( "-I%s", includedir ));
strarray_add( comp_args, strmake( "%s%s/wine/windows", 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/wine/windows", isystem, root, incl_dirs[j] )); 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] ));
}
} }
else if (opts->wine_objdir) else if (opts->wine_objdir)
strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );