diff options
| author |   George L. Albany <Megacake1234@gmail.com> | 2023-07-28 00:33:01 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-07-28 00:33:01 +0200 |
| commit | 4ed1e471b318fe065964131bb44eb70d9363d701 (patch) | |
| tree | 0a2d2b2a4abf6a05fc538a8fea39e361082a0b90 | |
| parent | debb71065c8947ee6d79c981eb43d631beb11294 (diff) | |
| parent | abedb335f8e7f54113f0f43552feba2b2b666c7d (diff) | |
Merge pull request #4 from OpenVicProject/seperate/dataloader-env
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -213,6 +213,8 @@ env.GlobRecursive = GlobRecursive SConscript("deps/SCsub") +env.openvic_dataloader = {} + # For the reference: # - CCFLAGS are compilation flags shared between C and C++ # - CFLAGS are for C-specific compilation flags @@ -245,10 +247,12 @@ if env["build_ovdl_library"]: library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources) Default(library) -env.Append(LIBPATH=[env.Dir("bin")]) + env.openvic_dataloader["LIBPATH"] = [env.Dir("bin")] + env.openvic_dataloader["LIBS"] = [library_name] + env.openvic_dataloader["INCPATH"] = [env.Dir("include")] -if library != None or os.path.exists("bin/%s" % library_name): - env.Append(LIBS=[library_name]) + env.Append(LIBPATH=env.openvic_dataloader["LIBPATH"]) + env.Append(LIBS=env.openvic_dataloader["LIBS"]) headless_program = None env["PROGSUFFIX"] = suffix + env["PROGSUFFIX"] |