Module: wine Branch: master Commit: e317eafe8f179fe927d72d9ae0e9247472556783 URL: https://gitlab.winehq.org/wine/wine/-/commit/e317eafe8f179fe927d72d9ae0e9247...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Mar 21 18:13:48 2024 +0100
configure: Don't build wow64 support in non-PE builds.
---
configure | 44 ++++++++++++++++++++++++++------------------ configure.ac | 49 +++++++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/configure b/configure index 9a7bc56bff4..91b272c4aea 100755 --- a/configure +++ b/configure @@ -6404,24 +6404,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } ;; esac
-enable_win16=${enable_win16:-i386} -enable_win64=${enable_win64:-no} -enable_wow64=${enable_wow64:-aarch64,x86_64} -enable_wow64win=${enable_wow64win:-aarch64,x86_64} -enable_wow64cpu=${enable_wow64cpu:-x86_64} -enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} - -enable_cmd=${enable_cmd:-yes} -enable_dllhost=${enable_dllhost:-yes} -enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} -enable_dxdiag=${enable_dxdiag:-yes} -enable_msiexec=${enable_msiexec:-yes} -enable_netsh=${enable_netsh:-yes} -enable_regsvr32=${enable_regsvr32:-yes} -enable_rundll32=${enable_rundll32:-yes} - -enable_winetest=${enable_winetest:-$enable_tests} - if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. @@ -21806,6 +21788,32 @@ fi ;; esac
+enable_win16=${enable_win16:-i386} +enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} + +if test -n "$PE_ARCHS" +then + enable_wow64=${enable_wow64:-aarch64,x86_64} + enable_wow64win=${enable_wow64win:-aarch64,x86_64} + enable_wow64cpu=${enable_wow64cpu:-x86_64} +else + enable_wow64=${enable_wow64:-no} + enable_wow64win=${enable_wow64win:-no} + enable_wow64cpu=${enable_wow64cpu:-no} +fi + +enable_cmd=${enable_cmd:-yes} +enable_dllhost=${enable_dllhost:-yes} +enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} +enable_dxdiag=${enable_dxdiag:-yes} +enable_msiexec=${enable_msiexec:-yes} +enable_netsh=${enable_netsh:-yes} +enable_regsvr32=${enable_regsvr32:-yes} +enable_rundll32=${enable_rundll32:-yes} + +enable_winetest=${enable_winetest:-$enable_tests} + +
diff --git a/configure.ac b/configure.ac index fa81d912106..16f8ea99691 100644 --- a/configure.ac +++ b/configure.ac @@ -154,26 +154,6 @@ case $host in ;; esac
-enable_win16=${enable_win16:-i386} -enable_win64=${enable_win64:-no} -enable_wow64=${enable_wow64:-aarch64,x86_64} -enable_wow64win=${enable_wow64win:-aarch64,x86_64} -enable_wow64cpu=${enable_wow64cpu:-x86_64} -enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} - -dnl Explicitly enable some programs for arm64ec -enable_cmd=${enable_cmd:-yes} -enable_dllhost=${enable_dllhost:-yes} -enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} -enable_dxdiag=${enable_dxdiag:-yes} -enable_msiexec=${enable_msiexec:-yes} -enable_netsh=${enable_netsh:-yes} -enable_regsvr32=${enable_regsvr32:-yes} -enable_rundll32=${enable_rundll32:-yes} - -dnl Disable winetest too if tests are disabled -enable_winetest=${enable_winetest:-$enable_tests} - dnl Some special cases for the 64-bit build if test "x$enable_win64" = "xyes" then @@ -2371,6 +2351,35 @@ case $host_vendor in *sun*) WINE_CHECK_DEFINE([__sun__]) ;; esac
+dnl *** Check for modules to disable by default + +enable_win16=${enable_win16:-i386} +enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} + +if test -n "$PE_ARCHS" +then + enable_wow64=${enable_wow64:-aarch64,x86_64} + enable_wow64win=${enable_wow64win:-aarch64,x86_64} + enable_wow64cpu=${enable_wow64cpu:-x86_64} +else + enable_wow64=${enable_wow64:-no} + enable_wow64win=${enable_wow64win:-no} + enable_wow64cpu=${enable_wow64cpu:-no} +fi + +dnl Explicitly enable some programs for arm64ec +enable_cmd=${enable_cmd:-yes} +enable_dllhost=${enable_dllhost:-yes} +enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} +enable_dxdiag=${enable_dxdiag:-yes} +enable_msiexec=${enable_msiexec:-yes} +enable_netsh=${enable_netsh:-yes} +enable_regsvr32=${enable_regsvr32:-yes} +enable_rundll32=${enable_rundll32:-yes} + +dnl Disable winetest too if tests are disabled +enable_winetest=${enable_winetest:-$enable_tests} + dnl **** Generate output files ****
AH_TOP([#ifndef __WINE_CONFIG_H