Merge branch 'sb/linux-build-improvements' of ssh://arn-wd-l1704.localdomain:2222/ue-foundation/zen into sb/linux-build-improvementssb/linux-build-improvements

1 files changed, 34 insertions, 11 deletions

diff --git a/xmake.lua b/xmake.lua
index f7f0c8df3..0d68e136c 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -191,6 +191,30 @@ if is_os("linux") or is_os("macosx") then
     add_cxxflags("-Wno-unused-but-set-variable", {tools="gcc"})
 end
 
+if get_config("toolchain") == "clang-cl" then
+    add_cxxflags("-Wno-unknown-warning-option", {force=true})
+    add_cxxflags("-Wno-cast-function-type-mismatch", {force=true})
+    add_cxxflags("-Wno-delete-non-abstract-non-virtual-dtor", {force=true})
+    add_cxxflags("-Wno-format", {force=true})
+    add_cxxflags("-Wno-implicit-fallthrough", {force=true})
+    add_cxxflags("-Wno-inconsistent-missing-override", {force=true})
+    add_cxxflags("-Wno-missing-field-initializers", {force=true})
+    add_cxxflags("-Wno-parentheses-equality", {force=true})
+    add_cxxflags("-Wno-reorder-ctor", {force=true})
+    add_cxxflags("-Wno-sign-compare", {force=true})
+    add_cxxflags("-Wno-strict-aliasing", {force=true})
+    add_cxxflags("-Wno-switch", {force=true})
+    add_cxxflags("-Wno-unused-but-set-variable", {force=true})
+    add_cxxflags("-Wno-unused-lambda-capture", {force=true})
+    add_cxxflags("-Wno-unused-parameter", {force=true})
+    add_cxxflags("-Wno-unused-private-field", {force=true})
+    add_cxxflags("-Wno-unused-value", {force=true})
+    add_cxxflags("-Wno-unused-variable", {force=true})
+    add_cxxflags("-Wno-vla-cxx-extension", {force=true})
+    add_cflags("-Wno-unknown-warning-option", {force=true})
+    add_cflags("-Wno-unused-command-line-argument", {force=true})
+end
+
 if is_os("macosx") then
     -- silence warnings about -Wno-vla-cxx-extension since to my knowledge we can't
     -- detect the clang version used in Xcode and only recent versions contain this flag
@@ -288,6 +312,13 @@ option("zentrace")
 option_end()
 add_define_by_config("ZEN_WITH_TRACE", "zentrace")
 
+option("zencpr")
+    set_default(true)
+    set_showmenu(true)
+    set_description("Enable CPR HTTP client backend")
+option_end()
+add_define_by_config("ZEN_WITH_CPR", "zencpr")
+
 set_warnings("allextra", "error")
 set_languages("cxx20")
 
@@ -330,7 +361,9 @@ end
 includes("src/zenstore",            "src/zenstore-test")
 includes("src/zentelemetry",        "src/zentelemetry-test")
 includes("src/zenutil",             "src/zenutil-test")
-includes("src/zenvfs")
+if is_plat("windows") then
+    includes("src/zenvfs")
+end
 includes("src/zenserver",           "src/zenserver-test")
 includes("src/zen")
 includes("src/zentest-appstub")
@@ -368,16 +401,6 @@ task("kill")
         end
     end)
 
-task("updatefrontend")
-    set_menu {
-        usage = "xmake updatefrontend",
-        description = "Create Zip of the frontend/html folder for bundling with zenserver executable",
-    }
-    on_run(function()
-        import("scripts.updatefrontend")
-        updatefrontend()
-    end)
-
 task("precommit")
     set_menu {
         usage = "xmake precommit",