env var for static lib

2 files changed, 16 insertions, 13 deletions

diff --git a/bindgen/rust/celeritas-sys/build.rs b/bindgen/rust/celeritas-sys/build.rs
index e2c240b..13aa04d 100644
--- a/bindgen/rust/celeritas-sys/build.rs
+++ b/bindgen/rust/celeritas-sys/build.rs
@@ -31,8 +31,12 @@ fn main() {
 
     // Tell cargo to look for shared libraries in the specified directory
     // TODO: we need to look based on OS
-    println!("cargo:rustc-link-search=../../../build/macosx/arm64/debug");
     // println!("cargo:rustc-link-search=../../build/windows/x64/debug");
+    
+    let static_lib_path = std::env::var("CELERITAS_CORE_LIB")
+        .unwrap_or("../../../build/macosx/arm64/debug".to_string());
+
+    println!("cargo:rustc-link-search={static_lib_path}");
 
     // Tell cargo to tell rustc to link the system bzip2
     // shared library.
diff --git a/src/new_render/render.c b/src/new_render/render.c
index 49b2bf9..9314871 100644
--- a/src/new_render/render.c
+++ b/src/new_render/render.c
@@ -273,20 +273,19 @@ void Geometry_Destroy(Geometry* geometry) {
   }
 }
 
-size_t ModelExtractRenderEnts(RenderEnt_darray* entities, ModelHandle model_handle, Mat4 affine, RenderEntityFlags flags) {
-   Model* model = MODEL_GET(model_handle);
-   for (u32 i = 0; i < model->mesh_count; i++) {
+size_t ModelExtractRenderEnts(RenderEnt_darray* entities, ModelHandle model_handle, Mat4 affine,
+                              RenderEntityFlags flags) {
+  Model* model = MODEL_GET(model_handle);
+  for (u32 i = 0; i < model->mesh_count; i++) {
     Mesh* m = Mesh_pool_get(Render_GetMeshPool(), model->meshes[i]);
-    RenderEnt data = {
-      .mesh = model->meshes[i],
-      .material = m->material,
-      .affine = affine,
-      // .bounding_box
-      .flags = flags
-    };
+    RenderEnt data = { .mesh = model->meshes[i],
+                       .material = m->material,
+                       .affine = affine,
+                       // .bounding_box
+                       .flags = flags };
     RenderEnt_darray_push(entities, data);
-   }
-   return model->mesh_count; // how many RenderEnts we pushed
+  }
+  return model->mesh_count;  // how many RenderEnts we pushed
 }
 
 void SetCamera(Camera camera) { g_core.renderer->scene.camera = camera; }