Merge pull request #11 from OpenVicProject/fix/build

Change headless library check to actually check library variable
OpenVicProject · Jan 19, 2024 · 4863eaf · 4863eaf
2 parents 55134f3 + d722dc8
commit 4863eaf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/SConstruct b/SConstruct
@@ -55,7 +55,7 @@ library_name = "liblexy-vdf{}{}".format(suffix, env["LIBSUFFIX"])
 default_args = []
 
 if env["build_lvdf_library"]:
-    library = env.StaticLibrary(target=os.path.join(BINDIR, library_name), source=sources)
+    library = env.StaticLibrary(target=env.File(os.path.join(BINDIR, library_name)), source=sources)
     default_args += [library]
 
     env.Append(LIBPATH=[env.Dir(BINDIR)])
@@ -75,7 +75,7 @@ if env["build_lvdf_headless"]:
     headless_env.Append(CPPDEFINES=["LEXY_VDF_HEADLESS"])
     headless_env.Append(CPPPATH=[headless_env.Dir(headless_path)])
     headless_env.headless_sources = env.GlobRecursive("*.cpp", headless_path)
-    if not env["build_lvdf_headless"]:
+    if not env["build_lvdf_library"]:
         headless_env.headless_sources += sources
     headless_program = headless_env.Program(
         target=os.path.join(BINDIR, headless_name),

diff --git a/include/lexy-vdf/KeyValues.hpp b/include/lexy-vdf/KeyValues.hpp
@@ -4,7 +4,6 @@
 #include <cstdint>
 #include <filesystem>
 #include <initializer_list>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <unordered_map>

diff --git a/include/lexy-vdf/Parser.hpp b/include/lexy-vdf/Parser.hpp
@@ -2,7 +2,6 @@
 
 #include <memory>
 #include <string_view>
-#include <unordered_map>
 #include <unordered_set>
 #include <vector>
 

diff --git a/include/lexy-vdf/detail/BasicParser.hpp b/include/lexy-vdf/detail/BasicParser.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <filesystem>
-#include <optional>
-#include <string_view>
 #include <vector>
 
 #include <lexy-vdf/ParseError.hpp>