Jacek Caban : winegcc: Add Wine include directories before standard directories on search list.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4f787812999b3b26f04b322fa0d78724596878c0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4f787812999b3b26f04b322fa0d78724596878c0

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Apr  6 00:36:41 2021 +0200

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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winegcc/winegcc.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index ae8f64f099d..694e2544a24 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -915,16 +915,17 @@ no_compat_defines:
             }
             strarray_add(comp_args, "-D__MSVCRT__");
         }
-        if (includedir)
+        if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
+        for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
         {
-            strarray_add( comp_args, strmake( "-I%s", includedir ));
-            strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
+            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( "-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", isystem, root, incl_dirs[j] ));
         }
     }
     else if (opts->wine_objdir)