Andre Heider : winegcc: Add -I for the prefix's include dir.

[Alexandre Julliard]

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

Author: Andre Heider <a.heider at gmail.com>
Date:   Sun Nov 18 18:26:57 2018 +0100

winegcc: Add -I for the prefix's include dir.

This allows external projects to e.g. "#include <wine/debug.h>" for
non-standard prefixes, like winehq's distro packages residing in /opt.

Signed-off-by: Andre Heider <a.heider at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winegcc/Makefile.in | 2 +-
 tools/winegcc/winegcc.c   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index 6de23b0..daeb91b 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -9,7 +9,7 @@ C_SRCS = \
 	winegcc.c
 
 winegcc_EXTRADEFS = \
-	-DINCLUDEDIR="\"${includedir}/wine\"" \
+	-DINCLUDEDIR="\"${includedir}\"" \
 	-DDLLDIR="\"${dlldir}\"" \
 	-DLIBDIR="\"${libdir}\"" \
 	-DCC="\"$(CC)\"" \
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 76442d8..6b3b4b6a 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -672,10 +672,11 @@ no_compat_defines:
     {
         if (opts->use_msvcrt)
         {
-            strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" );
+            strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" );
             strarray_add(comp_args, "-D__MSVCRT__");
         }
-        strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" );
+        strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR );
+        strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" );
     }
     else if (opts->wine_objdir)
         strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );