summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFabrice <fabrice@schaub-dev.xyz>2026-02-10 14:53:54 +0100
committerFabrice <fabrice@schaub-dev.xyz>2026-02-10 14:53:54 +0100
commit3f30bb5c626f38e55af8e0e77a0d5e5501ee2c91 (patch)
tree7dca80bcad8ae5473dbc44be81e8dba6ad709afe /Makefile
parent44b8ab08af2f7acf9bd30b75d07e8adf97884142 (diff)
fix makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0d03f50..6534869 100644
--- a/Makefile
+++ b/Makefile
@@ -38,18 +38,18 @@ HASHMAP_SOURCE = $(HASHMAP_DIR)/hashmap.c
WGPU_DIR = $(WORK_DIR)/wgpu
WGPU_MANIFEST = $(WGPU_DIR)/Cargo.toml
-WGPU_INCLUDE = $(WGPU_DIR)/ffi
-WGPU_WEBGPU_INCLUDE = $(WGPU_INCLUDE)/webgpu-headers
-WGPU_BUILD = $(WGPU_DIR)/target/release
-WGPU_LIB = $(WGPU_BUILD)/libwgpu_native.a
WGPU_MANIFEST_FLAG = --manifest-path $(WGPU_MANIFEST)
-WGPU_FLAGS = --release $(WGPU_MANIFEST_FLAG)
+WGPU_ARTIFACTS = $(WGPU_DIR)/build
+WGPU_LIB = $(WGPU_ARTIFACTS)/libwgpu_native.a
+WGPU_BUILD_FLAGS = --release --artifact-dir $(WGPU_ARTIFACTS) -Z unstable-options
+WGPU_INCLUDE = $(WGPU_DIR)/ffi
+WGPU_INCLUDE_WEBGPU = $(WGPU_INCLUDE)/webgpu-headers
CSH_FLAGS += \
-I$(MI_INCLUDE) \
-I$(HASHMAP_DIR) \
-I$(WGPU_INCLUDE) \
- -I$(WGPU_WEBGPU_INCLUDE)
+ -I$(WGPU_INCLUDE_WEBGPU)
MI_GENERATOR = "Unix Makefiles"
@@ -78,7 +78,7 @@ all: $(WAYCLOCK)
$(WGPU_LIB):
@echo " CARGO $@"
- @$(CARGO) build $(WGPU_FLAGS)
+ @$(CARGO) build $(WGPU_BUILD_FLAGS) $(WGPU_MANIFEST_FLAG)
$(MI_BUILD):
@echo " CMAKE $@"