From aa49dbbb3cf9dbff18c08245b0e46a9943df9b15 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Thu, 24 Aug 2023 00:33:21 +0100 Subject: Big Dataloader Commit (openvic) Default compat path + formatting + bits+bobs --- SConstruct | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index eefd99d..2d34e01 100644 --- a/SConstruct +++ b/SConstruct @@ -2,7 +2,6 @@ import os import sys from glob import glob -from pathlib import Path # Local from scripts.build.option_handler import OptionsClass @@ -60,9 +59,15 @@ if env["compiledb"]: # - CPPDEFINES are for pre-processor defines # - LINKFLAGS are for linking flags +ovsim_env = SConscript("extension/deps/openvic-simulation/SConstruct") + +env.Append(LIBPATH=ovsim_env.openvic_simulation["LIBPATH"]) +env.Append(LIBS=ovsim_env.openvic_simulation["LIBS"]) +env.Append(CPPPATH=ovsim_env.openvic_simulation["INCPATH"]) + # tweak this if you want to use different folders, or more folders, to store your source code in. -paths = ["extension/src/", "extension/deps/openvic-simulation/src/"] -env.Append(CPPPATH=paths) +paths = ["extension/src/"] +env.Append(CPPPATH=[[env.Dir(p) for p in paths]]) sources = GlobRecursive("*.cpp", paths) env.extension_sources = sources -- cgit v1.2.3-56-ga3b1