diff --git a/src/Tools/Common.mk b/src/Tools/Common.mk
index f1fb821a..ad11b1f7 100644
--- a/src/Tools/Common.mk
+++ b/src/Tools/Common.mk
@@ -13,4 +13,14 @@ define cp_artifact
 	)
 endef
 
+define cargo_windows_default
+	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
+	$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
+endef
+
+define cargo_unix_default
+	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
+	$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
+endef
+
 # Windows build requires "rustup target add x86_64-pc-windows-gnu" and "sudo apt-get install mingw-w64"
\ No newline at end of file
diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace
index dc2faa8f..f24c494f 100644
--- a/src/Tools/Tools.code-workspace
+++ b/src/Tools/Tools.code-workspace
@@ -6,7 +6,9 @@
 	],
 	"settings": {
 		"cargo_task": [
+			"psxreadmap all!Unix: psxreadmap",
 			"wslpath all!Unix: wslpath",
+			"psxreadmap all-windows!Windows: psxreadmap",
 			"wslpath all-windows!Windows: wslpath"
 		]
 	},
diff --git a/src/Tools/psxreadmap/Makefile b/src/Tools/psxreadmap/Makefile
new file mode 100644
index 00000000..b7ff0de0
--- /dev/null
+++ b/src/Tools/psxreadmap/Makefile
@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = psxreadmap
+
+.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/wslpath/Makefile b/src/Tools/wslpath/Makefile
index 1cdc3a34..cd0fb766 100644
--- a/src/Tools/wslpath/Makefile
+++ b/src/Tools/wslpath/Makefile
@@ -4,12 +4,10 @@ ARTIFACT = wslpath
 
 .PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
 $(WINDOWS_ARTIFACT):
-	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
-	$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
+	$(call cargo_windows_default)
 
 $(UNIX_ARTIFACT):
-	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
-	$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
+	$(call cargo_unix_default)
 
 all-windows: $(WINDOWS_ARTIFACT)
 all: $(UNIX_ARTIFACT)
\ No newline at end of file