File 0801-wx-add-support-for-ARM64-Windows.patch of Package erlang
From 78b2729bb24836c45b9657563625bb13547d0205 Mon Sep 17 00:00:00 2001
From: Cocoa <i@uwucocoa.moe>
Date: Sat, 26 Oct 2024 23:47:02 +0100
Subject: [PATCH] wx: add support for ARM64 Windows
---
lib/wx/configure | 40 ++++++++++++++++++++++++----------------
lib/wx/configure.ac | 40 ++++++++++++++++++++++++----------------
2 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/lib/wx/configure b/lib/wx/configure
index 47721faca3..3c267f8e83 100755
--- a/lib/wx/configure
+++ b/lib/wx/configure
@@ -6764,22 +6764,30 @@ printf "%s\n" "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;}
CWX_DOCUMENTED="$DOC_OPT2/wxWidgets-3.*.* $DOC_OPT2/wxMSW-3.*.* $CWX_DOCUMENTED"
case $ac_cv_sizeof_void_p in
- 8)
- VC_LIB=lib/vc_x64_lib
- WX_ARCH=x64
- DOC_OPT64_1=/opt/local64/pgm
- DOC_OPT64_2=/mnt/c/opt/local64/pgm
- CWX_DOCUMENTED="$DOC_OPT64_1/wxWidgets-3.*.* $DOC_OPT64_1/wxMSW-3.*.* $CWX_DOCUMENTED"
- CWX_DOCUMENTED="$DOC_OPT64_2/wxWidgets-3.*.* $DOC_OPT64_2/wxMSW-3.*.* $CWX_DOCUMENTED"
- ;;
- *)
- VC_LIB=lib/vc_lib
- WX_ARCH=x86
- DOC_OPT3=/opt/local32/pgm
- DOC_OPT4=/mnt/c/opt/local32/pgm
- CWX_DOCUMENTED="$DOC_OPT3/wxWidgets-3.*.* $DOC_OPT3/wxMSW-3.*.* $CWX_DOCUMENTED"
- CWX_DOCUMENTED="$DOC_OPT4/wxWidgets-3.*.* $DOC_OPT4/wxMSW-3.*.* $CWX_DOCUMENTED"
- ;;
+ 8)
+ case $host_cpu in
+ aarch64)
+ VC_LIB=lib/vc_arm64_lib
+ WX_ARCH=aarch64
+ ;;
+ *)
+ VC_LIB=lib/vc_x64_lib
+ WX_ARCH=x64
+ ;;
+ esac
+ DOC_OPT64_1=/opt/local64/pgm
+ DOC_OPT64_2=/mnt/c/opt/local64/pgm
+ CWX_DOCUMENTED="$DOC_OPT64_1/wxWidgets-3.*.* $DOC_OPT64_1/wxMSW-3.*.* $CWX_DOCUMENTED"
+ CWX_DOCUMENTED="$DOC_OPT64_2/wxWidgets-3.*.* $DOC_OPT64_2/wxMSW-3.*.* $CWX_DOCUMENTED"
+ ;;
+ *)
+ VC_LIB=lib/vc_lib
+ WX_ARCH=x86
+ DOC_OPT3=/opt/local32/pgm
+ DOC_OPT4=/mnt/c/opt/local32/pgm
+ CWX_DOCUMENTED="$DOC_OPT3/wxWidgets-3.*.* $DOC_OPT3/wxMSW-3.*.* $CWX_DOCUMENTED"
+ CWX_DOCUMENTED="$DOC_OPT4/wxWidgets-3.*.* $DOC_OPT4/wxMSW-3.*.* $CWX_DOCUMENTED"
+ ;;
esac
CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4"
diff --git a/lib/wx/configure.ac b/lib/wx/configure.ac
index ba34c709fc..c5b7df4732 100644
--- a/lib/wx/configure.ac
+++ b/lib/wx/configure.ac
@@ -488,22 +488,30 @@ AS_IF(
CWX_DOCUMENTED="$DOC_OPT2/wxWidgets-3.*.* $DOC_OPT2/wxMSW-3.*.* $CWX_DOCUMENTED"
case $ac_cv_sizeof_void_p in
- 8)
- VC_LIB=lib/vc_x64_lib
- WX_ARCH=x64
- DOC_OPT64_1=/opt/local64/pgm
- DOC_OPT64_2=/mnt/c/opt/local64/pgm
- CWX_DOCUMENTED="$DOC_OPT64_1/wxWidgets-3.*.* $DOC_OPT64_1/wxMSW-3.*.* $CWX_DOCUMENTED"
- CWX_DOCUMENTED="$DOC_OPT64_2/wxWidgets-3.*.* $DOC_OPT64_2/wxMSW-3.*.* $CWX_DOCUMENTED"
- ;;
- *)
- VC_LIB=lib/vc_lib
- WX_ARCH=x86
- DOC_OPT3=/opt/local32/pgm
- DOC_OPT4=/mnt/c/opt/local32/pgm
- CWX_DOCUMENTED="$DOC_OPT3/wxWidgets-3.*.* $DOC_OPT3/wxMSW-3.*.* $CWX_DOCUMENTED"
- CWX_DOCUMENTED="$DOC_OPT4/wxWidgets-3.*.* $DOC_OPT4/wxMSW-3.*.* $CWX_DOCUMENTED"
- ;;
+ 8)
+ case $host_cpu in
+ aarch64)
+ VC_LIB=lib/vc_arm64_lib
+ WX_ARCH=aarch64
+ ;;
+ *)
+ VC_LIB=lib/vc_x64_lib
+ WX_ARCH=x64
+ ;;
+ esac
+ DOC_OPT64_1=/opt/local64/pgm
+ DOC_OPT64_2=/mnt/c/opt/local64/pgm
+ CWX_DOCUMENTED="$DOC_OPT64_1/wxWidgets-3.*.* $DOC_OPT64_1/wxMSW-3.*.* $CWX_DOCUMENTED"
+ CWX_DOCUMENTED="$DOC_OPT64_2/wxWidgets-3.*.* $DOC_OPT64_2/wxMSW-3.*.* $CWX_DOCUMENTED"
+ ;;
+ *)
+ VC_LIB=lib/vc_lib
+ WX_ARCH=x86
+ DOC_OPT3=/opt/local32/pgm
+ DOC_OPT4=/mnt/c/opt/local32/pgm
+ CWX_DOCUMENTED="$DOC_OPT3/wxWidgets-3.*.* $DOC_OPT3/wxMSW-3.*.* $CWX_DOCUMENTED"
+ CWX_DOCUMENTED="$DOC_OPT4/wxWidgets-3.*.* $DOC_OPT4/wxMSW-3.*.* $CWX_DOCUMENTED"
+ ;;
esac
CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4"
--
2.43.0
