diff options
| author | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
| commit | ec5bdad811999470d1effd2e8e53942e34738f5c (patch) | |
| tree | cb97f432215bac4a5d59146f77da7ef65528ab95 /lib/wx/configure.in | |
| parent | e10d2cf8e16c6e42947f9d6b4383bf77c0f7c564 (diff) | |
| parent | 5ce5cc6c49ac06d282519494e8047498a7d985e0 (diff) | |
| download | otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.gz otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.bz2 otp-ec5bdad811999470d1effd2e8e53942e34738f5c.zip | |
Merge branch 'dgud/wx/prefer-wxMSW-3/OTP-12632'
* dgud/wx/prefer-wxMSW-3/OTP-12632:
wx: Fix variable cursor constants
wx: On Mac keyboards use meta field as raw_ctrl
wx: Prefer wxWidgets-3.0. branch on windows
Diffstat (limited to 'lib/wx/configure.in')
| -rw-r--r-- | lib/wx/configure.in | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 4c4d4f41a8..fbdddb9220 100644 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -441,19 +441,26 @@ else else CWXWIN_PROG=`cygpath -d "$PROGRAMFILES" | cygpath -f - 2>/dev/null` fi - CWXWIN3=$CWXWIN_PROG/wxWidgets-?.*.* - CWXWIN4=$CWXWIN_PROG/wxMSW-?.*.* - CWX_DOCUMENTED="/opt/local/pgm/wxMSW-?.*.* /opt/local/pgm/wxWidgets-?.*.*" + + CWXWIN3="$CWXWIN_PROG/wxWidgets-3.*.* $CWXWIN_PROG/wxWidgets-2.*.*" + CWXWIN4="$CWXWIN_PROG/wxMSW-3.*.* $CWXWIN_PROG/wxMSW-2.*.*" + + DOC_OPT=/opt/local/pgm + CWX_DOCUMENTED="$DOC_OPT/wxWidgets-2.*.* $DOC_OPT/wxMSW-2.*.*" + CWX_DOCUMENTED="$DOC_OPT/wxWidgets-3.*.* $DOC_OPT/wxMSW-3.*.* $CWX_DOCUMENTED" + case $ac_cv_sizeof_void_p in 8) - CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-?.*.* /opt/local64/pgm/wxWidgets-?.*.* $CWX_DOCUMENTED" + DOC_OPT64=/opt/local64/pgm + CWX_DOCUMENTED="$DOC_OPT64/wxWidgets-2.*.* $DOC_OPT64/wxMSW-2.*.* $CWX_DOCUMENTED" + CWX_DOCUMENTED="$DOC_OPT64/wxWidgets-3.*.* $DOC_OPT64/wxMSW-3.*.* $CWX_DOCUMENTED" ;; *) true ;; - esac - - CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*" + esac + + CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4" for dir in $CWXPATH; do AC_MSG_NOTICE(Checking: [$dir]) |