diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..89673e1
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,28 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "tasks": [
+        {
+            "taskName": "make",
+            "command": "make.bat",
+            "isBuildCommand": true
+        },
+        {
+            "taskName": "clean",
+            "command": "make.bat",
+            "args": [ "clean" ],
+            "isShellCommand": true
+        },
+        {
+            "taskName": "qemu (windowed)",
+            "command": "qemu-win.bat",
+            "showOutput": "never",
+            "isTestCommand": true
+        },
+        {
+            "taskName": "qemu",
+            "command": "qemu.bat"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/make.bat b/make.bat
index 8225572..58402ac 100644
--- a/make.bat
+++ b/make.bat
@@ -1,2 +1,6 @@
 @echo off
-bash -c "make %*"
+if exist C:\Windows\Sysnative\bash.exe (
+	C:\Windows\Sysnative\bash.exe -c "make %*"
+) else (
+	C:\Windows\System32\bash.exe -c "make %*"
+)