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

winegcc: Add -I for the prefix's include dir.
0e279d26 · Andre Heider · Alexandre Julliard · 6d4d8f2e · 0e279d26 · 0e279d26
Commit 0e279d26 authored Nov 18, 2018 by Andre Heider Committed by Alexandre Julliard Nov 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Makefile.in tools/winegcc/Makefile.in +1 -1

winegcc.c tools/winegcc/winegcc.c +3 -2

No files found.
--- 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)\"" \

--- 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) );