diff options
| author | Stefan Boberg <[email protected]> | 2021-09-07 10:19:13 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-07 10:19:13 +0200 |
| commit | 733358eece33fddbc343bbc415c9b26a6faea9cd (patch) | |
| tree | ab92ad6e1307194830e7985b249a5fb789465e74 | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-733358eece33fddbc343bbc415c9b26a6faea9cd.tar.xz zen-733358eece33fddbc343bbc415c9b26a6faea9cd.zip | |
Compile out experimental VFS code by default (not currently useful/functional)
| -rw-r--r-- | zenserver/vfs.cpp | 26 | ||||
| -rw-r--r-- | zenserver/vfs.h | 2 |
2 files changed, 16 insertions, 12 deletions
diff --git a/zenserver/vfs.cpp b/zenserver/vfs.cpp index 71f0bbdda..5b6a3e4b6 100644 --- a/zenserver/vfs.cpp +++ b/zenserver/vfs.cpp @@ -2,19 +2,20 @@ #include "vfs.h" -#include <zencore/except.h> -#include <zencore/filesystem.h> -#include <zencore/snapshot_manifest.h> -#include <zencore/stream.h> -#include <zencore/windows.h> +#if WITH_VFS +# include <zencore/except.h> +# include <zencore/filesystem.h> +# include <zencore/snapshot_manifest.h> +# include <zencore/stream.h> +# include <zencore/windows.h> -#include <map> +# include <map> -#include <atlfile.h> -#include <projectedfslib.h> -#include <spdlog/spdlog.h> +# include <atlfile.h> +# include <projectedfslib.h> +# include <spdlog/spdlog.h> -#pragma comment(lib, "projectedfslib.lib") +# pragma comment(lib, "projectedfslib.lib") namespace zen { @@ -472,9 +473,9 @@ ProjfsProvider::DebugPrint(const char* FmtString, ...) va_list vl; va_start(vl, FmtString); -#if 0 +# if 0 vprintf(FmtString, vl); -#endif +# endif va_end(vl); } @@ -896,3 +897,4 @@ Vfs::Stop() } } // namespace zen +#endif
\ No newline at end of file diff --git a/zenserver/vfs.h b/zenserver/vfs.h index e77ff381b..4b7c5e30a 100644 --- a/zenserver/vfs.h +++ b/zenserver/vfs.h @@ -2,6 +2,7 @@ #pragma once +#if WITH_VFS #include <zencore/httpserver.h> #include <zenstore/CAS.h> @@ -29,3 +30,4 @@ private: }; } // namespace zen +#endif |