Alexandre Julliard : Revert "makefiles: Only generate proxy code for the target architecture."

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Nov 14 18:18:53 2018 +0100

Revert "makefiles: Only generate proxy code for the target architecture."

This reverts commit ee206a37609f99e9dc024dbe19d4a9b842433813.
It's the default widl behavior now.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 Makefile.in     |  1 -
 configure       | 11 -----------
 configure.ac    |  5 -----
 tools/makedep.c |  3 ---
 4 files changed, 20 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c1242af..6b65fdf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,6 @@ MSVCRTFLAGS     = @BUILTINFLAG@
 TARGETFLAGS     = @TARGETFLAGS@
 UNWINDFLAGS     = @UNWINDFLAGS@
 LDEXECFLAGS     = @LDEXECFLAGS@
-WIDLFLAGS       = @WIDLFLAGS@
 LIBS            = @LIBS@
 BISON           = @BISON@
 FLEX            = @FLEX@
diff --git a/configure b/configure
index 92be309..dd45a4e 100755
--- a/configure
+++ b/configure
@@ -763,7 +763,6 @@ BISON
 FLEX
 TOOLSDIR
 wine64_disable
-WIDLFLAGS
 TARGETFLAGS
 LD
 CPPBIN
@@ -5513,8 +5512,6 @@ rm -f core conftest.err conftest.$ac_objext \
       notice_platform="32-bit "
       TARGETFLAGS="-m32"
 
-      WIDLFLAGS="--win32"
-
       PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig}
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
@@ -5550,8 +5547,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       notice_platform="64-bit "
       TARGETFLAGS="-m64"
 
-      WIDLFLAGS="--win64"
-
     fi
     ;;
   arm*)
@@ -5620,8 +5615,6 @@ rm -f core conftest.err conftest.$ac_objext \
     CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi"
     TARGETFLAGS="-marm -mfloat-abi=$float_abi"
 
-    WIDLFLAGS="--win32"
-
     ;;
   aarch64*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5
@@ -5646,13 +5639,9 @@ $as_echo "no" >&6; }
                        as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    WIDLFLAGS="--win64"
-
     ;;
   i[3456789]86*)
     enable_win16=${enable_win16:-yes}
-    WIDLFLAGS="--win32"
-
     ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index efec221..294fe4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ case $host in
       host_cpu="i386"
       notice_platform="32-bit "
       AC_SUBST(TARGETFLAGS,"-m32")
-      AC_SUBST(WIDLFLAGS,"--win32")
       PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig}
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
@@ -175,7 +174,6 @@ case $host in
       host_cpu="x86_64"
       notice_platform="64-bit "
       AC_SUBST(TARGETFLAGS,"-m64")
-      AC_SUBST(WIDLFLAGS,"--win64")
     fi
     ;;
   arm*)
@@ -207,7 +205,6 @@ case $host in
     esac
     CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi"
     AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi")
-    AC_SUBST(WIDLFLAGS,"--win32")
     ;;
   aarch64*)
     AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list])
@@ -215,11 +212,9 @@ case $host in
                       [AC_MSG_RESULT([yes])],
                       [AC_MSG_RESULT([no])
                        AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])])
-    AC_SUBST(WIDLFLAGS,"--win64")
     ;;
   i[[3456789]]86*)
     enable_win16=${enable_win16:-yes}
-    AC_SUBST(WIDLFLAGS,"--win32")
     ;;
 esac
 
diff --git a/tools/makedep.c b/tools/makedep.c
index e3bb04a..21ae2f7 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -133,7 +133,6 @@ static struct strarray msvcrt_flags;
 static struct strarray extra_cflags;
 static struct strarray cpp_flags;
 static struct strarray unwind_flags;
-static struct strarray widl_flags;
 static struct strarray libs;
 static struct strarray enable_tests;
 static struct strarray cmdline_vars;
@@ -2642,7 +2641,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source,
     output_filenames_obj_dir( make, targets );
     output( ": %s\n", tools_path( make, "widl" ));
     output( "\t%s -o $@", tools_path( make, "widl" ) );
-    output_filenames( widl_flags );
     output_filenames( target_flags );
     output_filenames( make->include_args );
     output_filenames( make->define_args );
@@ -4211,7 +4209,6 @@ int main( int argc, char *argv[] )
     extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" );
     cpp_flags    = get_expanded_make_var_array( top_makefile, "CPPFLAGS" );
     unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" );
-    widl_flags   = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" );
     libs         = get_expanded_make_var_array( top_makefile, "LIBS" );
     enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" );