Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wx: add support for ARM64 Windows #8990

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wx: add support for ARM64 Windows #8990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions lib/wx/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
40 changes: 24 additions & 16 deletions lib/wx/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading