marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Only generate proxy code for the target architecture. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Zebediah Figura 2018-09-30 22:24:32 -05:00 committed by Alexandre Julliard
parent 5cc501b0a9
commit ee206a3760
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -49,6 +49,7 @@ MSVCRTFLAGS = @BUILTINFLAG@
TARGETFLAGS = @TARGETFLAGS@
UNWINDFLAGS = @UNWINDFLAGS@
LDEXECFLAGS = @LDEXECFLAGS@
WIDLFLAGS = @WIDLFLAGS@
LIBS = @LIBS@
BISON = @BISON@
FLEX = @FLEX@

11
configure vendored
View File

@ -764,6 +764,7 @@ BISON
FLEX
TOOLSDIR
wine64_disable
WIDLFLAGS
TARGETFLAGS
LD
CPPBIN
@ -5509,6 +5510,8 @@ 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}
@ -5544,6 +5547,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
notice_platform="64-bit "
TARGETFLAGS="-m64"
WIDLFLAGS="--win64"
fi
;;
arm*)
@ -5612,6 +5617,8 @@ 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
@ -5636,9 +5643,13 @@ $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

5
configure.ac
View File

@ -157,6 +157,7 @@ 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}
@ -174,6 +175,7 @@ case $host in
host_cpu="x86_64"
notice_platform="64-bit "
AC_SUBST(TARGETFLAGS,"-m64")
AC_SUBST(WIDLFLAGS,"--win64")
fi
;;
arm*)
@ -205,6 +207,7 @@ 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])
@ -212,9 +215,11 @@ 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

3
tools/makedep.c
View File

@ -133,6 +133,7 @@ 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;
@ -2641,6 +2642,7 @@ 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 );
@ -4208,6 +4210,7 @@ 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" );