diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2019-09-09 17:16:36 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2019-11-12 07:34:17 +0100 |
| commit | a314e2768dd5c64950c48b24f32a0eec62ded385 (patch) | |
| tree | 9c83b068c0e5f7bb1d8aa223b03562b7e223ee16 /lib/wx | |
| parent | 5b8e5e0d27fcbebee51ae0e714cbe97630405904 (diff) | |
| download | erlang-a314e2768dd5c64950c48b24f32a0eec62ded385.tar.gz | |
Refactor win32 configure handling
There are a lot of MIXED_* options and adding a another mode for WSL
will make things worse, thus a cleanup is done first.
This commit consolidates the handling for the Makefiles, src and scripts and
moves the funcionality into similar named wrapper-scripts instead.
Path conversion is done with a script 'w32_path.sh' and
registry lookups with 'reg_query.sh'.
Path to the wrapper scripts is setup with: otp_build env_win32 <arch>.
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/configure.in | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/lib/wx/configure.in b/lib/wx/configure.in index f35e6cdbd0..9e62d81c5f 100644 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -82,7 +82,7 @@ LM_WINDOWS_ENVIRONMENT USER_CFLAGS=$CFLAGS -if test X"$MIXED_CYGWIN_VC" = X"yes" -o X"$MIXED_MSYS_VC" = X"yes"; then +if test X"$MIXED_VC" = X"yes" ; then CFLAGS="-Owx" fi @@ -319,7 +319,7 @@ dnl if test "$cross_compiling" = "yes"; then echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" >> ./CONF_INFO WXERL_CAN_BUILD_DRIVER=false -elif test X"$MIXED_CYGWIN_VC" = X"no" -a X"$MIXED_MSYS_VC" = X"no"; then +elif test X"$MIXED_VC" = X"no"; then WX_VERSION=`wx-config --version` case $WX_VERSION in 2.8.*) @@ -408,24 +408,15 @@ else fi fi - if test "x$MIXED_MSYS" = "xyes"; then - CWXWIN_CONFIG=`win2msys_path.sh $wx_config_name 2>/dev/null` - else - CWXWIN_CONFIG=`cygpath $wx_config_name 2>/dev/null` - fi + CWXWIN_CONFIG=`win32_path.sh -u $wx_config_name 2>/dev/null` CWXWIN1=`dirname $CWXWIN_CONFIG 2>/dev/null` CWXWIN2=`dirname $CWXWIN1 2>/dev/null` if test -z "$PROGRAMFILES" ; then - PROGRAMFILES=c:/Program Files + PROGRAMFILES="c:/Program\ Files" fi - - if test "x$MIXED_MSYS" = "xyes"; then - CWXWIN_PROG=`win2msys_path.sh "$PROGRAMFILES" 2>/dev/null` - else - CWXWIN_PROG=`cygpath -d "$PROGRAMFILES" | cygpath -f - 2>/dev/null` - fi + CWXWIN_PROG=`win32_path.sh -u "$PROGRAMFILES" 2>/dev/null` CWXWIN3="$CWXWIN_PROG/wxWidgets-3.*.* $CWXWIN_PROG/wxWidgets-2.*.*" CWXWIN4="$CWXWIN_PROG/wxMSW-3.*.* $CWXWIN_PROG/wxMSW-2.*.*" |