aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct4
-rw-r--r--deps/SCsub2
2 files changed, 2 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 3128ebc..c7717be 100644
--- a/SConstruct
+++ b/SConstruct
@@ -249,7 +249,7 @@ if env["build_ovdl_library"]:
Default(library)
env.Append(LIBPATH=[env.Dir(BINDIR)])
- env.Append(LIBS=[library_name])
+ env.Prepend(LIBS=[library_name])
env.openvic_dataloader["LIBPATH"] = env["LIBPATH"]
env.openvic_dataloader["LIBS"] = env["LIBS"]
@@ -267,8 +267,6 @@ if env["build_ovdl_headless"]:
headless_env.headless_sources = GlobRecursive("*.cpp", headless_path)
if not env["build_ovdl_library"]:
headless_env.headless_sources += sources
- else:
- headless_env.headless_sources += env.lexy_sources
headless_program = headless_env.Program(
target=os.path.join(BINDIR, headless_name),
source=headless_env.headless_sources,
diff --git a/deps/SCsub b/deps/SCsub
index 1afe1a6..eb27dab 100644
--- a/deps/SCsub
+++ b/deps/SCsub
@@ -39,7 +39,7 @@ def build_lexy(env):
env.Append(CXXFLAGS=["-isystem", lexy_env.Dir("lexy/include")])
env.Append(CXXFLAGS=[""])
env.Append(LIBPATH=[lexy_env.Dir("lexy/src")])
- env.Append(LIBS=[library_name])
+ env.Prepend(LIBS=[library_name])
build_lexy(env) \ No newline at end of file