Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e317eafe
Commit
e317eafe
authored
Mar 21, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Don't build wow64 support in non-PE builds.
parent
f67b4f6b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
38 deletions
+55
-38
configure
configure
+26
-18
configure.ac
configure.ac
+29
-20
No files found.
configure
View file @
e317eafe
...
...
@@ -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
}
...
...
configure.ac
View file @
e317eafe
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment