From d72384407c1d4522a7889854e2c4ff44e448ad65 Mon Sep 17 00:00:00 2001 From: jaby Date: Mon, 7 Oct 2024 22:36:47 +0200 Subject: [PATCH] Add root build --- src/Tools/Makefile | 8 ++++++++ src/Tools/Tools.code-workspace | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Tools/Makefile b/src/Tools/Makefile index e69de29b..d8187906 100644 --- a/src/Tools/Makefile +++ b/src/Tools/Makefile @@ -0,0 +1,8 @@ +PROJECTS = cpp_out jaby_engine_fconv mkoverlay psxcdgen_ex psxreadmap wslpath +.PHONY: $(PROJECTS) + +$(foreach var,$(PROJECTS),$(var)): + $(MAKE) -C ./$@ $(MAKECMDGOALS) + +all-windows: $(PROJECTS) +all: $(PROJECTS) \ No newline at end of file diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace index 7291b385..aa91f88f 100644 --- a/src/Tools/Tools.code-workspace +++ b/src/Tools/Tools.code-workspace @@ -6,6 +6,7 @@ ], "settings": { "cargo_task": [ + "./ all!Unix: All", "cpp_out all!Unix: cpp_out", "jaby_engine_fconv all!Unix: jaby_engine_fconv", "mkoverlay all!Unix: mkoverlay", @@ -14,6 +15,7 @@ "psxreadmap all!Unix: psxreadmap", "wslpath all!Unix: wslpath", + "./ all-windows!Windows: All", "cpp_out all-windows!Windows: cpp_out", "jaby_engine_fconv all-windows!Windows: jaby_engine_fconv", "mkoverlay all-windows!Windows: mkoverlay", @@ -27,16 +29,16 @@ "version": "2.0.0", "tasks": [ { - "label": "cargo2", + "label": "cargo", "type": "shell", "group": { "kind": "build" }, "windows": { - "command": "wsl --shell-type login make -C ./${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}" + "command": "wsl --shell-type login make -C ${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}" }, "linux": { - "command": "make -C ./${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}" + "command": "make -C ${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}" }, "problemMatcher": [] }