Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only generate linkage if CARGO_WORKSPACE_DIR is available #154

Merged
merged 8 commits into from
Jan 12, 2025

Conversation

schell
Copy link
Owner

@schell schell commented Jan 11, 2025

RenderlingPaths

This makes the CARGO_WORKSPACE_DIR env var optional.

Without this env var we can't compile shaders or generate linkage.

Neither of those things should happen when cargo builds this library as a dependency, so this is fine.

Note that calling cargo xtask compile-shaders or cargo xtask generate-linkage will err if CARGO_WORKSPACE_DIR is not available, but the env var is always available inside renderling's source tree. Outside the source tree the xtask program won't be available, so the situation where xtask cannot build shaders or generate linkage is unreachable.

Dependencies

This also updates dependencies.

I've pinned wgpu to 23.0 instead of tracking main.

I've pinned spirv-std to a specific rev to fix glam mismatches.

Fixes #153.

@schell schell marked this pull request as ready for review January 11, 2025 20:34
@schell schell merged commit 75eee86 into main Jan 12, 2025
10 checks passed
@schell schell deleted the fix/dont-expect-cargo-workspace-dir branch January 12, 2025 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CARGO_WORKSPACE_DIR env var unavailable outside of renderling repo
1 participant