Merge pull request #160 from OpenVicProject/terrain-types

Terrain types

3 files changed, 8 insertions, 1 deletions

diff --git a/extension/deps/SCsub b/extension/deps/SCsub
index 25a3286..6a7a48d 100644
--- a/extension/deps/SCsub
+++ b/extension/deps/SCsub
@@ -9,4 +9,11 @@ def build_openvic_simulation(env):
     env.Append(CPPPATH=ovsim_env.openvic_simulation["INCPATH"])
     env.openvic_simulation = ovsim_env.openvic_simulation
 
-build_openvic_simulation(env)
\ No newline at end of file
+def build_gli(env):
+    gli_includes = ["gli", "gli/external"]
+    env.gli_loader = {}
+    env.gli_loader["INCPATH"] = [env.Dir(p) for p in gli_includes]
+    env.Append(CPPPATH=env.gli_loader["INCPATH"])
+
+build_openvic_simulation(env)
+build_gli(env)
diff --git a/extension/deps/gli b/extension/deps/gli
new file mode 160000
+Subproject 779b99ac6656e4d30c3b24e96e0136a59649a86
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
-Subproject 05b6db7305398e12363f727a50315972cc9a5a5
+Subproject 04795924456062db1631686a90f13d963791ad3