From d722dc8de19e9e5eeef07db30114b3bd0123018b Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 19 Jan 2024 12:50:19 -0500 Subject: [PATCH] Change build_lvdf_library target to File Change headless library check to actually check library variable Remove unused headers in KeyValues.hpp, Parser.hpp, and BasicParer.hpp --- SConstruct | 4 ++-- include/lexy-vdf/KeyValues.hpp | 1 - include/lexy-vdf/Parser.hpp | 1 - include/lexy-vdf/detail/BasicParser.hpp | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/SConstruct b/SConstruct index 95e172e..9374a28 100644 --- 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 index b8d438e..a699cae 100644 --- a/include/lexy-vdf/KeyValues.hpp +++ b/include/lexy-vdf/KeyValues.hpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/include/lexy-vdf/Parser.hpp b/include/lexy-vdf/Parser.hpp index 8b1ad14..2facfd9 100644 --- a/include/lexy-vdf/Parser.hpp +++ b/include/lexy-vdf/Parser.hpp @@ -2,7 +2,6 @@ #include #include -#include #include #include diff --git a/include/lexy-vdf/detail/BasicParser.hpp b/include/lexy-vdf/detail/BasicParser.hpp index 4b2f0fe..76f84ae 100644 --- a/include/lexy-vdf/detail/BasicParser.hpp +++ b/include/lexy-vdf/detail/BasicParser.hpp @@ -1,8 +1,5 @@ #pragma once -#include -#include -#include #include #include