mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-10-14 02:29:07 +00:00
chore: fix build on linux
This commit is contained in:
@@ -40,6 +40,11 @@ function ModMan:project()
|
|||||||
"%{prj.location}"
|
"%{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)
|
self:include(includes)
|
||||||
webview:include(includes)
|
webview:include(includes)
|
||||||
|
|
||||||
|
@@ -53,7 +53,9 @@ int main()
|
|||||||
},
|
},
|
||||||
nullptr);
|
nullptr);
|
||||||
|
|
||||||
|
#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE)
|
||||||
edge::InstallCustomProtocolHandler(w);
|
edge::InstallCustomProtocolHandler(w);
|
||||||
|
#endif
|
||||||
|
|
||||||
w.navigate("http://modman/index.html");
|
w.navigate("http://modman/index.html");
|
||||||
w.run();
|
w.run();
|
||||||
|
29
thirdparty/webview.lua
vendored
29
thirdparty/webview.lua
vendored
@@ -11,18 +11,20 @@ end
|
|||||||
|
|
||||||
function webview:link(links)
|
function webview:link(links)
|
||||||
|
|
||||||
links:add("WebView2LoaderStatic")
|
if os.host() == "windows" then
|
||||||
|
links:add("WebView2LoaderStatic")
|
||||||
|
|
||||||
filter "platforms:x86"
|
filter "platforms:x86"
|
||||||
libdirs {
|
libdirs {
|
||||||
path.join(self:msWebviewDir(), "build/native/x86")
|
path.join(self:msWebviewDir(), "build/native/x86")
|
||||||
}
|
}
|
||||||
filter {}
|
filter {}
|
||||||
filter "platforms:x64"
|
filter "platforms:x64"
|
||||||
libdirs {
|
libdirs {
|
||||||
path.join(self:msWebviewDir(), "build/native/x64")
|
path.join(self:msWebviewDir(), "build/native/x64")
|
||||||
}
|
}
|
||||||
filter {}
|
filter {}
|
||||||
|
end
|
||||||
|
|
||||||
links:add(self:name())
|
links:add(self:name())
|
||||||
end
|
end
|
||||||
@@ -59,6 +61,11 @@ function webview:project()
|
|||||||
self:installWebview2()
|
self:installWebview2()
|
||||||
end
|
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)
|
self:include(includes)
|
||||||
|
|
||||||
-- Disable warnings. They do not have any value to us since it is not our code.
|
-- Disable warnings. They do not have any value to us since it is not our code.
|
||||||
|
Reference in New Issue
Block a user