wx: Include the edge webview loader in wx

Include it so that the end users that install the prebuilt erlang don't need
to build the loader as well as install the edge-chromium library.

1 files changed, 29 insertions, 14 deletions

diff --git a/lib/wx/configure b/lib/wx/configure
index 5bb47bc029..d9b49ea5fe 100755
--- a/lib/wx/configure
+++ b/lib/wx/configure
@@ -629,6 +629,7 @@ TESS_CB_TIGER_STYLE
 HAVE_GL_SUPPORT
 RC_FILE_TYPE
 WX_HAVE_STATIC_LIBS
+WX_WEBVIEW_DLL
 FORCED_DEBUG_BUILD
 DEBUG_WX_LIBS_STATIC
 DEBUG_WX_LIBS
@@ -5791,8 +5792,8 @@ $as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;}
 
     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.*.*"
+    CWXWIN3="$CWXWIN_PROG/wxWidgets-3.*.*
+    CWXWIN4="$CWXWIN_PROG/wxMSW-3.*.*
 
     DOC_OPT1=/opt/local/pgm
     DOC_OPT2=/mnt/c/opt/local/pgm
@@ -5801,12 +5802,16 @@ $as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;}
 
     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"
@@ -5824,18 +5829,11 @@ $as_echo "$as_me: Checking: $dir" >&6;}
 	    WXINCLUDE_PLAIN=$dir/include
 	    WX_CFLAGS="-EHsc -D_UNICODE -DUNICODE -I$WXINCLUDE_MSVC -I$WXINCLUDE_PLAIN -D__WXMSW__"
 	    WX_CXXFLAGS="-TP $WX_CFLAGS"
-	    WX_LIBDIR=$dir/lib/vc_lib
-	    WX_LIBDIR64=$dir/lib/vc_x64_lib
+	    WX_LIBDIR=$dir/$VC_LIB
 	    WX_RESCOMP="rc.sh -I$WXINCLUDE_PLAIN -D __WIN32__"
 	    RC_FILE_TYPE=res
-	    for lib in $WX_LIBDIR $WX_LIBDIR64; do
-		maybe=`ls $lib/wxbase*.lib 2> /dev/null | egrep 'wxbase[0-9]*u\.lib'`
-		if test '!' -z "$maybe"; then
-		   corelib_number=`echo $maybe | sed 's,.*\([0-9].\)u\.lib,\1,'`
-		   WX_LIBDIR=$lib
-		   break
-		fi
-	    done
+  	    base=`ls $WX_LIBDIR/wxbase*.lib 2> /dev/null | egrep 'wxbase[0-9]*u\.lib'`
+  	    corelib_number=`echo $base | sed 's,.*\([0-9].\)u\.lib,\1,'`
 	    if test '!' -z "$corelib_number"; then
 		WXLIBNO=$corelib_number
 		WX_LIBS0="wxmsw${WXLIBNO}u_stc wxmsw${WXLIBNO}u_xrc wxmsw${WXLIBNO}u_html"
@@ -5847,8 +5845,9 @@ $as_echo "$as_me: Checking: $dir" >&6;}
 		for lib in $WX_LIBS0 $WX_LIBS1 $WX_LIBS2 $WX_LIBS3 $WX_SYSLIBS; do
 		   WX_LIBS_STATIC="$WX_LIBS_STATIC -l$lib"
 		done
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
-$as_echo "$dir" >&6; }
+                WXDIR=$dir
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Found: $dir" >&5
+$as_echo "Found: $dir" >&6; }
 		break
 	    fi
 	fi
@@ -5867,11 +5866,27 @@ $as_echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;}
     fi
 
     fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for edge webview loader" >&5
+$as_echo_n "checking for edge webview loader... " >&6; }
+    WEBVIEW_DLL=$WXDIR/3rdparty/webview2/build/native/$WX_ARCH/WebView2Loader.dll
+    if test -f "$WEBVIEW_DLL"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WEBVIEW_DLL" >&5
+$as_echo "$WEBVIEW_DLL" >&6; }
+        WX_WEBVIEW_DLL=$WEBVIEW_DLL
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in $WEBVIEW_DLL" >&5
+$as_echo "not found in $WEBVIEW_DLL" >&6; }
+        WX_WEBVIEW_DLL=
+    fi
+
+
     WX_HAVE_STATIC_LIBS=true
 
 
 
 
+
     $as_echo "#define WXE_WEBVIEW 1" >>confdefs.h
 
 fi