Skip to content

Commit

Permalink
Merge pull request #8990 from cocoa-xu/cx-wx-configure
Browse files Browse the repository at this point in the history 
wx: add support for ARM64 Windows
  • Loading branch information
@dgud
dgud authored Nov 27, 2024
2 parents 67ba3bd + 78b2729 commit 3e679a5
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 32 deletions.
40 changes: 24 additions & 16 deletions lib/wx/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6775,22 +6775,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"
Expand Down
40 changes: 24 additions & 16 deletions lib/wx/configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,22 +490,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"
Expand Down

0 comments on commit 3e679a5

Please sign in to comment.