Merge pull request #30 from OpenVicProject/fix/compiledb

2 files changed, 9 insertions, 2 deletions

diff --git a/SConstruct b/SConstruct
index d856eec..8040a48 100644
--- a/SConstruct
+++ b/SConstruct
@@ -52,9 +52,11 @@ library = None
 env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"]
 library_name = "libopenvic-dataloader{}{}".format(suffix, env["LIBSUFFIX"])
 
+default_args = []
+
 if env["build_ovdl_library"]:
     library = env.StaticLibrary(target=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_ovdl_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/scripts b/scripts
-Subproject a0ca6e84c28eba5df99381fb32d1fd149d86f5b
+Subproject 3a4190526bde8e3fcd49c3ebcf77b5a87dc8ab6