wine: fixed my errors (reverted original code)

1 files changed, 23 insertions, 10 deletions

diff --git a/packages/app-emulation/wine/wine.exlib b/packages/app-emulation/wine/wine.exlib
index ecf4729..3829994 100644
--- a/packages/app-emulation/wine/wine.exlib
+++ b/packages/app-emulation/wine/wine.exlib
@@ -193,6 +193,19 @@ fi
 # The tests need a running X and even then they're unreliable
 RESTRICT="test"
 
+# Wine's configure checks for 64bit x86 platforms and tries to add -m32 to CC if --enable-win64 is
+# not given. This check (yes, that means the amd64 stuff) is chosen to be equivalent to wine's check
+# in configure.ac.
+my_win64_enable() {
+    case "${1}" in
+        x86_64*|amd64*)
+            echo "--enable-win64"
+            ;;
+        *)
+            echo "--disable-win64"
+            ;;
+    esac
+}
 
 ECONF_SOURCE=${WORK}
 WORK_HOST=${WORK}-host
@@ -234,16 +247,10 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
     --without-opencl
     --without-sdl
     --without-v4l
-
+    $(my_win64_enable $(exhost --target))
     $(exhost --is-native -q || echo --with-wine-tools="${WORK_HOST}")
 )
 
-if ever at_least 3.11 ; then
-    DEFAULT_SRC_CONFIGURE_PARAMS+=(
-        # Direct3D 12 support
-        --without-vkd3d
-    )
-fi
 
 DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
     alsa
@@ -268,9 +275,13 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
     vulkan
 )
 
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    win64
-)
+#if ever at_least 3.11 ; then
+#    DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=(
+#     "vulkan vkd3d"
+#   )
+#fi
+
+
 
 if [[ -n ${COMPHOLIO_PV} ]]; then
     DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=(
@@ -360,6 +371,8 @@ wine_src_configure() {
         edo popd
     fi
 
+    
+
     # NOTE(compnerd) the configure script is broken and checks with_lcms2 for the --with{,out}-cms
     # option, so specify this in addition to the proper handling of the option
     # NOTE --with-wine-tools while cross-compiling disables all build rules for the tools and