Skip to content

Commit

Permalink
fix(Extensions): add cargo workspace to build all Rust extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
ShadowApex committed Sep 28, 2024
1 parent c948f32 commit 95d5540
Show file tree
Hide file tree
Showing 11 changed files with 128 additions and 161 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ force-import: $(ALL_EXTENSIONS)
extensions: $(ALL_EXTENSIONS) ## Build native extensions
$(ALL_EXTENSIONS) &: $(ALL_EXTENSION_FILES)
@echo "Building native extensions..."
cd ./extensions/core && $(MAKE) build
cd ./extensions && $(MAKE) build

.PHONY: edit
edit: $(IMPORT_DIR) ## Open the project in the Godot editor
Expand Down Expand Up @@ -193,7 +193,7 @@ $(EXPORT_TEMPLATE):

.PHONY: debug
debug: $(IMPORT_DIR) ## Run the project in debug mode in gamescope
$(GAMESCOPE) -e --xwayland-count 2 -- \
$(GAMESCOPE) -e --xwayland-count 2 --expose-wayland -- \
$(GODOT) --path $(PWD) --remote-debug tcp://127.0.0.1:6007 \
--position 320,140 res://entrypoint.tscn

Expand Down Expand Up @@ -293,6 +293,7 @@ rootfs: build/opengamepad-ui.x86_64
cp -r build/*.so $(ROOTFS)/usr/share/opengamepadui
cp -r build/opengamepad-ui.x86_64 $(ROOTFS)/usr/share/opengamepadui
cp -r build/opengamepad-ui.pck $(ROOTFS)/usr/share/opengamepadui
cp ./extensions/target/release/reaper $(ROOTFS)/usr/share/opengamepadui
touch $(ROOTFS)/.gdignore


Expand Down
2 changes: 2 additions & 0 deletions extensions/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/target
*.so
Loading

0 comments on commit 95d5540

Please sign in to comment.