diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace
index f24c494f..474edc25 100644
--- a/src/Tools/Tools.code-workspace
+++ b/src/Tools/Tools.code-workspace
@@ -6,8 +6,19 @@
 	],
 	"settings": {
 		"cargo_task": [
+			"cpp_out all!Unix: cpp_out",
+			"jaby_engine_fconv all!Unix: jaby_engine_fconv",
+			"mkoverlay all!Unix: mkoverlay",
+			"psxcdgen_ex all!Unix: psxcdgen_ex",
+			"psxcdread all!Unix: psxcdread",
 			"psxreadmap all!Unix: psxreadmap",
 			"wslpath all!Unix: wslpath",
+
+			"cpp_out all-windows!Windows: cpp_out",
+			"jaby_engine_fconv all-windows!Windows: jaby_engine_fconv",
+			"mkoverlay all-windows!Windows: mkoverlay",
+			"psxcdgen_ex all-windows!Windows: psxcdgen_ex",
+			"psxcdread all-windows!Windows: psxcdread",
 			"psxreadmap all-windows!Windows: psxreadmap",
 			"wslpath all-windows!Windows: wslpath"
 		]
diff --git a/src/Tools/cpp_out/Makefile b/src/Tools/cpp_out/Makefile
new file mode 100644
index 00000000..d9336e6c
--- /dev/null
+++ b/src/Tools/cpp_out/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = cpp_out
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)
\ No newline at end of file
diff --git a/src/Tools/jaby_engine_fconv/Makefile b/src/Tools/jaby_engine_fconv/Makefile
new file mode 100644
index 00000000..5e994cd7
--- /dev/null
+++ b/src/Tools/jaby_engine_fconv/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = jaby_engine_fconv
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)
\ No newline at end of file
diff --git a/src/Tools/mkoverlay/Makefile b/src/Tools/mkoverlay/Makefile
new file mode 100644
index 00000000..5df9b213
--- /dev/null
+++ b/src/Tools/mkoverlay/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = mkoverlay
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)
\ No newline at end of file
diff --git a/src/Tools/psxcdgen_ex/Makefile b/src/Tools/psxcdgen_ex/Makefile
new file mode 100644
index 00000000..5f824357
--- /dev/null
+++ b/src/Tools/psxcdgen_ex/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = psxcdgen_ex
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)
\ No newline at end of file
diff --git a/src/Tools/psxcdread/Makefile b/src/Tools/psxcdread/Makefile
new file mode 100644
index 00000000..2da0ca78
--- /dev/null
+++ b/src/Tools/psxcdread/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = psxcdread
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)
\ No newline at end of file