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

Use -isystem for system includes as they should be processed after the 

-I includes. Spotted by Boaz Harrosh.
This commit is contained in:
Dimitrie O. Paun 2005-03-11 10:25:59 +00:00 committed by Alexandre Julliard
parent 8435f6f058
commit cfb6c8ebca
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/winegcc/winegcc.c
View File

@ -258,15 +258,7 @@ static void compile(struct options* opts, const char* lang)
#endif #endif
strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " "));
} }
if (!opts->wine_mode && !opts->nostdinc)
{
if (opts->use_msvcrt)
{
strarray_add(comp_args, "-I" INCLUDEDIR "/msvcrt");
strarray_add(comp_args, "-D__MSVCRT__");
}
strarray_add(comp_args, "-I" INCLUDEDIR "/windows");
}
strarray_add(comp_args, "-DWIN32"); strarray_add(comp_args, "-DWIN32");
strarray_add(comp_args, "-D_WIN32"); strarray_add(comp_args, "-D_WIN32");
strarray_add(comp_args, "-D__WIN32"); strarray_add(comp_args, "-D__WIN32");
@ -331,6 +323,23 @@ static void compile(struct options* opts, const char* lang)
strarray_add(comp_args, opts->files->base[j]); strarray_add(comp_args, opts->files->base[j]);
} }
/* standard includes come last in the include search path */
#ifdef __GNUC__
#define SYS_INCLUDE "-isystem"
#else
#define SYS_INCLUDE "-I"
#endif
if (!opts->wine_mode && !opts->nostdinc)
{
if (opts->use_msvcrt)
{
strarray_add(comp_args, SYS_INCLUDE INCLUDEDIR "/msvcrt");
strarray_add(comp_args, "-D__MSVCRT__");
}
strarray_add(comp_args, SYS_INCLUDE INCLUDEDIR "/windows");
}
#undef SYS_INCLUDE
spawn(opts->prefix, comp_args); spawn(opts->prefix, comp_args);
} }