Merge pull request #8 from MurrayIRC/vscode-updates

Vscode updates

2 files changed, 48 insertions, 118 deletions

diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json
index 8c8a67ea..b65aa1c1 100644
--- a/projects/VSCode/.vscode/launch.json
+++ b/projects/VSCode/.vscode/launch.json
@@ -5,67 +5,7 @@
         "version": "0.2.0",
         "configurations": [
           {
-            "name": "(WIN) Debug",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/game.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe",
-            "setupCommands": [
-              {
-                "description": "Enable pretty-printing for gdb",
-                "text": "-enable-pretty-printing",
-                "ignoreFailures": false
-              }
-            ],
-            "preLaunchTask": "(WIN) build debug"
-          },
-          {
-            "name": "(WIN) Run",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/game.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe",
-            "setupCommands": [
-              {
-                "description": "Enable pretty-printing for gdb",
-                "text": "-enable-pretty-printing",
-                "ignoreFailures": false
-              }
-            ],
-            "preLaunchTask": "(WIN) build release"
-          },
-          {
-            "name": "(OSX) Debug",
-            "type": "lldb",
-            "request": "launch",
-            "program": "${workspaceFolder}/game",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "(OSX) build debug"
-          },
-          {
-            "name": "(OSX) Run",
-            "type": "lldb",
-            "request": "launch",
-            "program": "${workspaceFolder}/game",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "(OSX) build release"
-          },
-          {
-            "name": "(GNU) Debug",
+            "name": "Debug",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/game",
@@ -75,7 +15,6 @@
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
-            "miDebuggerPath": "/usr/bin/gdb",
             "setupCommands": [
               {
                 "description": "Enable pretty-printing for gdb",
@@ -83,28 +22,39 @@
                 "ignoreFailures": false
               }
             ],
-            "preLaunchTask": "(GNU) build debug"
+            "windows": {
+              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe",
+            },
+            "osx": {
+              "MIMode": "lldb"
+            },
+            "linux": {
+              "miDebuggerPath": "/usr/bin/gdb",
+            },
+            "preLaunchTask": "build debug"
           },
           {
-            "name": "(GNU) Run",
+            "name": "Run",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/game",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
+            "program": "${workspaceFolder}/game",
             "MIMode": "gdb",
-            "miDebuggerPath": "/usr/bin/gdb",
-            "setupCommands": [
-              {
-                "description": "Enable pretty-printing for gdb",
-                "text": "-enable-pretty-printing",
-                "ignoreFailures": false
-              }
-            ],
-            "preLaunchTask": "(GNU) build release"
+            "windows": {
+              "program": "${workspaceFolder}/game.exe",
+              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe"
+            },
+            "osx": {
+              "MIMode": "lldb"
+            },
+            "linux": {
+              "miDebuggerPath": "/usr/bin/gdb"
+            },
+            "preLaunchTask": "build release",
           }
         ]
       }
diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json
index d94a2d69..6106c05f 100644
--- a/projects/VSCode/.vscode/tasks.json
+++ b/projects/VSCode/.vscode/tasks.json
@@ -4,67 +4,47 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "(WIN) build release",
-            "type": "process",
-            "command": "C:/raylib/mingw/bin/mingw32-make.exe",
-            "args": [
-                "PLATFORM=PLATFORM_DESKTOP",
-                "RAYLIB_PATH=C:/raylib/raylib",
-            ],
-            "group": "build"
-        },
-        {
-            "label": "(WIN) build debug",
-            "type": "process",
-            "command": "C:/raylib/mingw/bin/mingw32-make.exe",
-            "args": [
-                "PLATFORM=PLATFORM_DESKTOP",
-                "RAYLIB_PATH=C:/raylib/raylib",
-                "DEBUGGING=TRUE"
-            ],
-            "group": "build"
-        },
-        {
-            "label": "(OSX) build debug",
-            "type": "process",
-            "command": "make",
-            "args": [
-                "PLATFORM=PLATFORM_DESKTOP",
-                "RAYLIB_PATH=<path_to_raylib>",
-                "DEBUGGING=TRUE"
-            ],
-            "group": "build"
-        },
-        {
-            "label": "(OSX) build release",
-            "type": "process",
-            "command": "make",
-            "args": [
-                "PLATFORM=PLATFORM_DESKTOP",
-                "RAYLIB_PATH=<path_to_raylib>",
-            ],
-            "group": "build"
-        },
-        {
-            "label": "(GNU) build debug",
+            "label": "build debug",
             "type": "process",
             "command": "make",
             "args": [
                 "PLATFORM=PLATFORM_DESKTOP",
                 "DEBUGGING=TRUE"
             ],
+            "windows": {
+                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "args": [
+                    "RAYLIB_PATH=C:/raylib/raylib"
+                ],
+            },
+            "osx": {
+                "args": [
+                    "RAYLIB_PATH=/Users/murray/work/ray/raylib"
+                ],
+            },
             "group": {
                 "kind": "build",
                 "isDefault": true
             }
         },
         {
-            "label": "(GNU) build release",
+            "label": "build release",
             "type": "process",
             "command": "make",
             "args": [
                 "PLATFORM=PLATFORM_DESKTOP",
             ],
+            "windows": {
+                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "args": [
+                    "RAYLIB_PATH=C:/raylib/raylib",
+                ],
+            },
+            "osx": {
+                "args": [
+                    "RAYLIB_PATH=/Users/murray/work/ray/raylib",
+                ],
+            },
             "group": "build"
         }
     ]