Adding WEBUI_WEBVIEW_STATIC (WebView2LoaderStatic.lib)

Author: AlbertShown

GNUmakefile

@@ -49,6 +49,11 @@ CIVETWEB_BUILD_FLAGS := -o civetweb.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFIL
 CIVETWEB_DEFINE_FLAGS = -DNDEBUG -DNO_CACHING -DNO_CGI -DUSE_WEBSOCKET $(TLS_CFLAG)
 WEBUI_BUILD_FLAGS := -o webui.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFILE_DIR)/src/webui.c" -I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
 WIN32_WV2_BUILD_FLAGS := -o win32_wv2.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFILE_DIR)/src/webview/win32_wv2.cpp" -I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
+WV2_STATIC_LIB :=
+ifeq ($(WEBUI_WEBVIEW_STATIC),1)
+WIN32_WV2_BUILD_FLAGS += -DWEBUI_WEBVIEW_STATIC
+WV2_STATIC_LIB := "$(MAKEFILE_DIR)/WebView2LoaderStatic.lib"
+endif
 WARNING_RELEASE := -w
 WARNING_LOG := -Wall -Wno-unused
 
@@ -144,7 +149,7 @@ endif
 	&& echo "Build WebUI library ($(CC) $(TARGET) debug dynamic)..." \
 	&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -g -fPIC \
 	&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) -g -fPIC -DWEBUI_LOG -DWEBUI_DYNAMIC \
-	&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) $(WIN32_WV2_OBJ) -g -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) $(CPP_FLAGS)
+	&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) $(WIN32_WV2_OBJ) -g -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) $(CPP_FLAGS) $(WV2_STATIC_LIB)
 ifeq ($(PLATFORM),windows)
 	@cd "$(BUILD_DIR)/debug" && del *.o >nul 2>&1
 else
@@ -183,7 +188,7 @@ endif
 	&& echo "Build WebUI library ($(CC) $(TARGET) release dynamic)..." \
 	&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -Os -fPIC \
 	&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE) -O3 -fPIC -DWEBUI_DYNAMIC \
-	&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) $(WIN32_WV2_OBJ) -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) $(CPP_FLAGS)
+	&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) $(WIN32_WV2_OBJ) -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS) $(CPP_FLAGS) $(WV2_STATIC_LIB)
 #	Clean
 ifeq ($(PLATFORM),windows)
 	@strip --strip-unneeded $(BUILD_DIR)/$(LIB_DYN_OUT)

Makefile

@@ -32,12 +32,17 @@ CIVETWEB_BUILD_FLAGS = /Fo"civetweb.obj" /c /EHsc "$(MAKEDIR)/src/civetweb/civet
 CIVETWEB_DEFINE_FLAGS = /D NDEBUG /D NO_CACHING /D NO_CGI /D USE_WEBSOCKET
 WEBUI_BUILD_FLAGS = /Fo"webui.obj" /c /EHsc "$(MAKEDIR)/src/webui.c" /I"$(MAKEDIR)/include" /I"$(MAKEDIR)/src/webview" /I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
 WIN32_WV2_BUILD_FLAGS = /Fo"win32_wv2.obj" /c /EHsc "$(MAKEDIR)/src/webview/win32_wv2.cpp" /I"$(MAKEDIR)/include" /I"$(MAKEDIR)/src/webview" /I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
+WV2_STATIC_LIB =
+!IF "$(WEBUI_WEBVIEW_STATIC)" == "1"
+WIN32_WV2_BUILD_FLAGS = $(WIN32_WV2_BUILD_FLAGS) /DWEBUI_WEBVIEW_STATIC
+WV2_STATIC_LIB = "$(MAKEDIR)\WebView2LoaderStatic.lib"
+!ENDIF
 WARNING_RELEASE = /w
 WARNING_LOG = /W4
 
 # Output Commands
-LIB_STATIC_OUT = /OUT:"$(WEBUI_OUT_LIB_NAME)-static.lib" "webui.obj" "civetweb.obj" "win32_wv2.obj"
-LIB_DYN_OUT = /DLL /OUT:"$(WEBUI_OUT_LIB_NAME).dll" "webui.obj" "civetweb.obj" "win32_wv2.obj" user32.lib Advapi32.lib Shell32.lib Ole32.lib $(TLS_LDFLAG_DYNAMIC)
+LIB_STATIC_OUT = /OUT:"$(WEBUI_OUT_LIB_NAME)-static.lib" "webui.obj" "civetweb.obj" "win32_wv2.obj" $(WV2_STATIC_LIB)
+LIB_DYN_OUT = /DLL /OUT:"$(WEBUI_OUT_LIB_NAME).dll" "webui.obj" "civetweb.obj" "win32_wv2.obj" user32.lib Advapi32.lib Shell32.lib Ole32.lib $(TLS_LDFLAG_DYNAMIC) $(WV2_STATIC_LIB)
 
 # == 2.TARGETS ================================================================
 

src/webview/win32_wv2.cpp

@@ -287,16 +287,24 @@ class WebView2Instance {
     };
 #endif
 
+#ifdef WEBUI_WEBVIEW_STATIC
+// The WebView2LoaderStatic.lib is linked, no need to load WebView2Loader.dll
+#else
 // Cached WebView2Loader.dll handle and function pointer
 static HMODULE g_webviewLib = NULL;
 typedef HRESULT (__stdcall *CreateCoreWebView2EnvironmentWithOptionsFunc)(
     PCWSTR, PCWSTR, ICoreWebView2EnvironmentOptions*,
     ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler*);
 static CreateCoreWebView2EnvironmentWithOptionsFunc g_createEnv = NULL;
+#endif
 
 extern "C" {
 
 bool _webui_win32_wv2_check_loader_dll(void) {
+    #ifdef WEBUI_WEBVIEW_STATIC
+    // The WebView2LoaderStatic.lib is linked, no need to load WebView2Loader.dll
+    return true;
+    #else
     // Already loaded and cached
     if (g_webviewLib && g_createEnv) {
         return true;
@@ -314,6 +322,7 @@ bool _webui_win32_wv2_check_loader_dll(void) {
         return false;
     }
     return true;
+    #endif
 }
 
 _webui_win32_wv2_handle _webui_win32_wv2_create(void) {
@@ -441,11 +450,9 @@ bool _webui_win32_wv2_create_environment(_webui_win32_wv2_handle handle, wchar_t
     if (!handle) return false;
     WebView2Instance* instance = static_cast<WebView2Instance*>(handle);
 
-    // Ensure DLL is loaded (use cached if available)
-    if (!g_webviewLib || !g_createEnv) {
-        if (!_webui_win32_wv2_check_loader_dll()) {
-            return false;
-        }
+    // Ensure loader is ready (DLL or static)
+    if (!_webui_win32_wv2_check_loader_dll()) {
+        return false;
     }
 
     _wputenv(L"WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS=--enable-features=msWebView2EnableDraggableRegions");
@@ -455,13 +462,21 @@ bool _webui_win32_wv2_create_environment(_webui_win32_wv2_handle handle, wchar_t
         if (!environmentHandler) {
             return false;
         }
+        #ifdef WEBUI_WEBVIEW_STATIC
+        HRESULT hr = CreateCoreWebView2EnvironmentWithOptions(NULL, cacheFolder, NULL, environmentHandler.Get());
+        #else
         HRESULT hr = g_createEnv(NULL, cacheFolder, NULL, environmentHandler.Get());
+        #endif
     #else
         EnvironmentCompletedHandler* environmentHandler = new EnvironmentCompletedHandler(instance);
         if (!environmentHandler) {
             return false;
         }
+        #ifdef WEBUI_WEBVIEW_STATIC
+        HRESULT hr = CreateCoreWebView2EnvironmentWithOptions(NULL, cacheFolder, NULL, environmentHandler);
+        #else
         HRESULT hr = g_createEnv(NULL, cacheFolder, NULL, environmentHandler);
+        #endif
     #endif
 
     return SUCCEEDED(hr);