# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1603401358 0 # Node ID b3989eee8d88c657b96fef52bfe749d4f2290640 # Parent e136e65547bf795ac1c1e7d9b0b80bba54804834 Win: Changes to support static linking of the WebView2 loader. The GA version of the WebView2 SDK has been released, but it can't use the Edge stable channel, so you need to make sure the runtime is installed. https://developer.microsoft.com/en-us/microsoft-edge/webview2/ diff -r e136e65547bf -r b3989eee8d88 makefile.vc --- a/makefile.vc Mon Oct 19 20:51:31 2020 +0000 +++ b/makefile.vc Thu Oct 22 21:15:58 2020 +0000 @@ -94,7 +94,12 @@ !if exists($(WEBVIEW2DIR)\build\native\include\WebView2.h) WEBVIEW2INC=-DBUILD_EDGE -I$(WEBVIEW2DIR)\build\native\include +!if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2LoaderStatic.lib) +WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2LoaderStatic.lib version.lib +!else WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll.lib +WEBVIEW2LOADER=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll +!endif WEBVIEW2OBJ=edge.obj !endif @@ -174,8 +179,8 @@ -erase dwcompat.dll.manifest copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll -!if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll) - copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll +!if exists($(WEBVIEW2LOADER)) + copy $(WEBVIEW2LOADER) $(DWDLLDIR)\WebView2Loader.dll !endif dw.obj: $(SRCDIR)\win\dw.c