From 8eb0c6c14bd12286d06962d0a97acfbcc7862afd Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Sat, 11 Nov 2023 15:29:15 -0500 Subject: Fix compiledb warning --- SConstruct | 11 +++++++++-- deps/lexy-vdf | 2 +- deps/openvic-dataloader | 2 +- scripts | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 4d96e4a..ca4729c 100644 --- a/SConstruct +++ b/SConstruct @@ -52,9 +52,11 @@ library = None env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"] library_name = "libopenvic-simulation{}{}".format(suffix, env["LIBSUFFIX"]) +default_args = [] + if env["build_ovsim_library"]: library = env.StaticLibrary(target=env.File(os.path.join(BINDIR, library_name)), source=sources) - Default(library) + default_args += [library] env.Append(LIBPATH=[env.Dir(BINDIR)]) env.Prepend(LIBS=[library_name]) @@ -80,8 +82,13 @@ if env["build_ovsim_headless"]: source=headless_env.headless_sources, PROGSUFFIX=".headless" + env["PROGSUFFIX"] ) - Default(headless_program) + default_args += [headless_program] + +# Add compiledb if the option is set +if env.get("compiledb", False): + default_args += ["compiledb"] +Default(*default_args) if "env" in locals(): # FIXME: This method mixes both cosmetic progress stuff and cache handling... diff --git a/deps/lexy-vdf b/deps/lexy-vdf index 83c7aff..55134f3 160000 --- a/deps/lexy-vdf +++ b/deps/lexy-vdf @@ -1 +1 @@ -Subproject commit 83c7aff3a00407ec21e40f83464af848ad21e9da +Subproject commit 55134f31310da603b428f8e892458bd0ba841609 diff --git a/deps/openvic-dataloader b/deps/openvic-dataloader index c368942..ce1f1e5 160000 --- a/deps/openvic-dataloader +++ b/deps/openvic-dataloader @@ -1 +1 @@ -Subproject commit c3689423a74594344e46dc7d91ea9d85fccc4e80 +Subproject commit ce1f1e5fe32ed0856bd2b6df5136dad3f6bc9918 diff --git a/scripts b/scripts index a0ca6e8..3a41905 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit a0ca6e84c28eba5df99381fb32d1fd149d86f5b7 +Subproject commit 3a4190526bde8e3fcd49c3ebcf77b5a87dc8ab62 -- cgit v1.2.3-56-ga3b1