fixes

tests/ShaderDep/ShaderDep.cpp

@@ -5,9 +5,16 @@ Catcrafts.net
 
 LGPL-3.0-only.
 
-Verifies that when an executable consumes a library that registers a shader,
-the resulting .spv ships in the executable's bin dir alongside the binary —
-not just in the lib's own bin dir, where the runtime exe wouldn't find it.
+Verifies that when an executable consumes a library that registers shaders
+or asset files, those runtime artifacts ship in the executable's bin dir
+alongside the binary — not just in the lib's own bin dir, where the runtime
+exe wouldn't find them. Covers a .spv (cfg.shaders), a flat asset
+(cfg.files file), and a directory tree (cfg.files dir).
+
+Also verifies cfg.buildFiles' include-path semantic: the consumer's own
+shader compile resolves `#include "ui-shared.glsl"` against the lib's
+buildFiles in-place from the dep's source tree (no copy), and the file is
+NOT mirrored into any build/bin dir.
 */
 
 import std;
@@ -50,6 +57,58 @@ int main() {
             return 1;
         }
 
+        fs::path appAsset = cfg.BinDir() / "asset.txt";
+        if (!fs::exists(appAsset)) {
+            std::println(std::cerr, "exe-side asset.txt missing at {}", appAsset.string());
+            return 1;
+        }
+        if (ReadFile(appAsset) != "crafter-build asset\n") {
+            std::println(std::cerr, "asset.txt content mismatch at {}", appAsset.string());
+            return 1;
+        }
+
+        fs::path appNested = cfg.BinDir() / "data" / "nested.txt";
+        if (!fs::exists(appNested)) {
+            std::println(std::cerr, "exe-side data/nested.txt missing at {}", appNested.string());
+            return 1;
+        }
+        if (ReadFile(appNested) != "nested asset\n") {
+            std::println(std::cerr, "data/nested.txt content mismatch at {}", appNested.string());
+            return 1;
+        }
+
+        // The consumer shader includes a header from the lib's buildFiles.
+        // Successful build (above) means glslang resolved the include
+        // in-place from the dep's source tree — verify the resulting .spv
+        // and the SPIR-V magic, same as for the lib's shader.
+        fs::path consumerSpv = cfg.BinDir() / "consumer.spv";
+        if (!fs::exists(consumerSpv)) {
+            std::println(std::cerr, "consumer .spv missing at {}", consumerSpv.string());
+            return 1;
+        }
+        std::ifstream cf(consumerSpv, std::ios::binary);
+        unsigned char cmagic[4] = {};
+        cf.read(reinterpret_cast<char*>(cmagic), 4);
+        if (cmagic[0] != 0x03 || cmagic[1] != 0x02 || cmagic[2] != 0x23 || cmagic[3] != 0x07) {
+            std::println(std::cerr,
+                "SPIR-V magic mismatch in consumer.spv: got {:#04x} {:#04x} {:#04x} {:#04x}",
+                cmagic[0], cmagic[1], cmagic[2], cmagic[3]);
+            return 1;
+        }
+
+        // buildFiles must NOT be copied anywhere — they're read in place.
+        for (fs::path probe : {
+                cfg.BinDir() / "ui-shared.glsl",
+                cfg.BuildDir() / "ui-shared.glsl",
+                cfg.dependencies[0]->BinDir() / "ui-shared.glsl",
+                cfg.dependencies[0]->BuildDir() / "ui-shared.glsl",
+            }) {
+            if (fs::exists(probe)) {
+                std::println(std::cerr, "ui-shared.glsl unexpectedly copied to {}", probe.string());
+                return 1;
+            }
+        }
+
         return 0;
     } catch (const std::exception& e) {
         std::println(std::cerr, "test exception: {}", e.what());

tests/ShaderDep/inner/consumer.glsl

@@ -0,0 +1,16 @@
+#version 450
+#extension GL_GOOGLE_include_directive : require
+
+#include "ui-shared.glsl"
+
+layout(location = 0) out vec3 color;
+
+void main() {
+    vec2 positions[3] = vec2[](
+        vec2( 0.0, -0.5),
+        vec2( 0.5,  0.5),
+        vec2(-0.5,  0.5)
+    );
+    gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0);
+    color = ui_color();
+}

tests/ShaderDep/inner/lib/asset.txt

@@ -0,0 +1 @@
+crafter-build asset

tests/ShaderDep/inner/lib/data/nested.txt

@@ -0,0 +1 @@
+nested asset

tests/ShaderDep/inner/lib/ui-shared.glsl

@@ -0,0 +1,8 @@
+#ifndef UI_SHARED_GLSL
+#define UI_SHARED_GLSL
+
+vec3 ui_color() {
+    return vec3(0.25, 0.5, 1.0);
+}
+
+#endif

tests/ShaderDep/inner/project.cpp

@@ -16,6 +16,9 @@ extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>)
         ShaderLib->GetInterfacesAndImplementations(ifaces, impls);
     }
     ShaderLib->shaders.emplace_back("./lib/triangle.glsl", "main", ShaderType::Vertex);
+    ShaderLib->files.emplace_back("./lib/asset.txt");
+    ShaderLib->files.emplace_back("./lib/data");
+    ShaderLib->buildFiles.emplace_back("./lib/ui-shared.glsl");
 
     Configuration app;
     app.path = "./";
@@ -29,5 +32,6 @@ extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>)
         std::array<fs::path, 1> impls = { "main" };
         app.GetInterfacesAndImplementations(ifaces, impls);
     }
+    app.shaders.emplace_back("./consumer.glsl", "main", ShaderType::Vertex);
     return app;
 }