diff --git a/src/ModMan.lua b/src/ModMan.lua index b01c8257..7aae5f18 100644 --- a/src/ModMan.lua +++ b/src/ModMan.lua @@ -39,6 +39,11 @@ function ModMan:project() includedirs { "%{prj.location}" } + + filter { "system:linux", "action:gmake" } + buildoptions { "`pkg-config --cflags gtk4 webkitgtk-6.0`" } + linkoptions { "`pkg-config --libs gtk4 webkitgtk-6.0`" } + filter {} self:include(includes) webview:include(includes) diff --git a/src/ModMan/main.cpp b/src/ModMan/main.cpp index 810239ac..98bfa0a9 100644 --- a/src/ModMan/main.cpp +++ b/src/ModMan/main.cpp @@ -53,7 +53,9 @@ int main() }, nullptr); +#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE) edge::InstallCustomProtocolHandler(w); +#endif w.navigate("http://modman/index.html"); w.run(); diff --git a/thirdparty/webview.lua b/thirdparty/webview.lua index ea292309..5fef3927 100644 --- a/thirdparty/webview.lua +++ b/thirdparty/webview.lua @@ -11,18 +11,20 @@ end function webview:link(links) - links:add("WebView2LoaderStatic") - - filter "platforms:x86" - libdirs { - path.join(self:msWebviewDir(), "build/native/x86") - } - filter {} - filter "platforms:x64" - libdirs { - path.join(self:msWebviewDir(), "build/native/x64") - } - filter {} + if os.host() == "windows" then + links:add("WebView2LoaderStatic") + + filter "platforms:x86" + libdirs { + path.join(self:msWebviewDir(), "build/native/x86") + } + filter {} + filter "platforms:x64" + libdirs { + path.join(self:msWebviewDir(), "build/native/x64") + } + filter {} + end links:add(self:name()) end @@ -58,6 +60,11 @@ function webview:project() if os.host() == "windows" then self:installWebview2() end + + filter { "system:linux", "action:gmake" } + buildoptions { "`pkg-config --cflags gtk4 webkitgtk-6.0`" } + linkoptions { "`pkg-config --libs gtk4 webkitgtk-6.0`" } + filter {} self:include(includes)