diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000000..81c2529184
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,125 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+         "name": "msys2-mingw32",
+         "includePath": [
+             "C:/msys64/mingw32/include",
+             "C:/msys64/mingw32/i686-w64-mingw32/include",
+             "${workspaceRoot}/libretro-common/include",
+             "${workspaceRoot}/include",                
+             "${workspaceRoot}"
+         ],
+         "defines": [
+             "_DEBUG",
+             "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+             "path": [
+                  "C:/msys64/mingw32/include",
+                  "C:/msys64/mingw32/i686-w64-mingw32/include",
+                  "${workspaceRoot}/libretro-common/include",
+                  "${workspaceRoot}/include",                
+                  "${workspaceRoot}"
+             ],
+             "limitSymbolsToIncludedHeaders": true,
+             "databaseFilename": ""
+         }
+        },
+        {
+         "name": "msys2-mingw64",
+         "includePath": [
+             "C:/msys64/mingw64/include",
+             "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+             "${workspaceRoot}/libretro-common/include",
+             "${workspaceRoot}/include",                
+             "${workspaceRoot}"
+         ],
+         "defines": [
+             "_DEBUG",
+             "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+             "path": [
+                  "C:/msys64/mingw64/include",
+                  "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                  "${workspaceRoot}/libretro-common/include",
+                  "${workspaceRoot}/include",                
+                  "${workspaceRoot}"
+             ],
+             "limitSymbolsToIncludedHeaders": true,
+             "databaseFilename": ""
+         }
+     }
+    ],
+    "version": 3
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 53837e538f..6e1f69631a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,7 @@
    "version": "0.2.0",
    "configurations": [
       {
-         "name": "MINGW64 (MSYS2) debug",
+         "name": "msys2-mingw64 debug",
          "type": "cppdbg",
          "request": "launch",
          "program": "${workspaceFolder}/retroarch.exe",
@@ -23,6 +23,26 @@
                "ignoreFailures": true
             }
          ]
+      },
+      {
+         "name": "msys2-mingw32 debug",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceFolder}/retroarch.exe",
+         "args": [],
+         "stopAtEntry": false,
+         "cwd": "${workspaceFolder}",
+         "environment": [],
+         "externalConsole": true,
+         "MIMode": "gdb",
+         "miDebuggerPath": "c:\\msys64\\mingw32\\bin\\gdb.exe",
+         "setupCommands": [
+            {
+               "description": "Enable pretty-printing for gdb",
+               "text": "-enable-pretty-printing",
+               "ignoreFailures": true
+            }
+         ]
       }
    ]
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 496810ecfa..b271c66e8f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
    "version": "2.0.0",
    "tasks": [
       {
-         "taskName": "Build",
+         "taskName": "msys2-mingw64 build",
          "type": "shell",
 
          "group": {
@@ -22,7 +22,7 @@
          }
       }
       {
-         "taskName": "Build with debugging symbols",
+         "taskName": "msys2-mingw64 build with debug symbols",
          "type": "shell",
 
          "group": "build",
@@ -38,7 +38,7 @@
          }
       }
       {
-         "taskName": "Build without reconfiguring",
+         "taskName": "msys2-mingw64 rebuild",
          "type": "shell",
 
          "group": "build",
@@ -54,7 +54,7 @@
          }
       }
       {
-         "taskName": "Clean",
+         "taskName": "msys2-mingw64 clean",
          "type": "shell",
 
          "group": "build",
@@ -70,7 +70,7 @@
          }
       }
       {
-         "taskName": "Start",
+         "taskName": "msys2-mingw64 run",
          "type": "shell",
 
          "group": {