Mercurial > dwindows

comparison makefile.vc @ 2194:b3989eee8d88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 22 Oct 2020 21:15:58 +0000
parents 81c50388851d
children e7060d262939
comparison
equal deleted inserted replaced
2193:e136e65547bf 2194:b3989eee8d88
92 WEBVIEW2DIR=$(SRCDIR)\packages\Microsoft.Web.WebView2 92 WEBVIEW2DIR=$(SRCDIR)\packages\Microsoft.Web.WebView2
93 !endif 93 !endif
94 94
95 !if exists($(WEBVIEW2DIR)\build\native\include\WebView2.h) 95 !if exists($(WEBVIEW2DIR)\build\native\include\WebView2.h)
96 WEBVIEW2INC=-DBUILD_EDGE -I$(WEBVIEW2DIR)\build\native\include 96 WEBVIEW2INC=-DBUILD_EDGE -I$(WEBVIEW2DIR)\build\native\include
97 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2LoaderStatic.lib)
98 WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2LoaderStatic.lib version.lib
99 !else
97 WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll.lib 100 WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll.lib
101 WEBVIEW2LOADER=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll
102 !endif
98 WEBVIEW2OBJ=edge.obj 103 WEBVIEW2OBJ=edge.obj
99 !endif 104 !endif
100 105
101 # 106 #
102 # Settings for supporting WinToast notifications 107 # Settings for supporting WinToast notifications
172 $(WLIB) -def:$(DEFFILE2) -machine:$(TARGET_CPU) -out:dwcompat.lib 177 $(WLIB) -def:$(DEFFILE2) -machine:$(TARGET_CPU) -out:dwcompat.lib
173 mt.exe -manifest dwcompat.dll.manifest -outputresource:dwcompat.dll;2 178 mt.exe -manifest dwcompat.dll.manifest -outputresource:dwcompat.dll;2
174 -erase dwcompat.dll.manifest 179 -erase dwcompat.dll.manifest
175 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib 180 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
176 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll 181 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
177 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll) 182 !if exists($(WEBVIEW2LOADER))
178 copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll 183 copy $(WEBVIEW2LOADER) $(DWDLLDIR)\WebView2Loader.dll
179 !endif 184 !endif
180 185
181 dw.obj: $(SRCDIR)\win\dw.c 186 dw.obj: $(SRCDIR)\win\dw.c
182 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c 187 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c
183 188