aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-09 16:29:41 +0200
committerStefan Boberg <[email protected]>2021-09-09 16:29:41 +0200
commitef61906444894820b53c0b314b56e1a3c1f75468 (patch)
tree3f3b2b89ce70fca792ad61ca645f798e39a2bea8
parentAdded compile time logic to toggle http.sys / null http implementation on/off (diff)
downloadzen-ef61906444894820b53c0b314b56e1a3c1f75468.tar.xz
zen-ef61906444894820b53c0b314b56e1a3c1f75468.zip
Improved VFS feature toggle logic
-rw-r--r--xmake.lua10
-rw-r--r--zenserver/vfs.cpp2
-rw-r--r--zenserver/vfs.h6
3 files changed, 14 insertions, 4 deletions
diff --git a/xmake.lua b/xmake.lua
index ad12af351..3cec35ac2 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -36,8 +36,14 @@ add_defines("USE_SENTRY=1")
option("vfs")
set_showmenu(true)
- set_description("Enable or disable VFS functionality")
- add_defines("WITH_VFS")
+ set_description("Enable VFS functionality")
+ add_defines("ZEN_WITH_VFS")
+option_end()
+
+option("httpsys")
+ set_showmenu(true)
+ set_description("Enable http.sys server")
+ add_defines("ZEN_WITH_HTTPSYS")
option_end()
add_defines("UNICODE", "_CONSOLE")
diff --git a/zenserver/vfs.cpp b/zenserver/vfs.cpp
index 16b23513f..18d8f1842 100644
--- a/zenserver/vfs.cpp
+++ b/zenserver/vfs.cpp
@@ -2,7 +2,7 @@
#include "vfs.h"
-#if WITH_VFS
+#if ZEN_WITH_VFS
# include <zencore/except.h>
# include <zencore/filesystem.h>
# include <zencore/snapshot_manifest.h>
diff --git a/zenserver/vfs.h b/zenserver/vfs.h
index f8fea6e12..0d2ca6062 100644
--- a/zenserver/vfs.h
+++ b/zenserver/vfs.h
@@ -2,7 +2,11 @@
#pragma once
-#if WITH_VFS
+#ifndef ZEN_WITH_VFS
+# define ZEN_WITH_VFS 0
+#endif
+
+#if ZEN_WITH_VFS
# include <memory>
namespace zen {