Fix VSCode intellisense

rhargreaves · Feb 3, 2024 · 4df6b55 · 4df6b55
1 parent bacfbef
commit 4df6b55
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,18 +4,17 @@
             "name": "Docker",
             "includePath": [
                 "${workspaceFolder}/src",
+                "${workspaceFolder}/res",
                 "${workspaceFolder}/../SGDK/inc",
                 "${workspaceFolder}/../SGDK/inc/ext",
                 "${workspaceFolder}/../SGDK/inc/ext/mw",
                 "${workspaceFolder}/../SGDK/res",
+                "${workspaceFolder}/tests/cmocka/include",
                 "${workspaceFolder}/tests/unit",
                 "${workspaceFolder}/tests/system",
                 "${workspaceFolder}/tests",
-                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
-                "${workspaceFolder}/res",
-                "${workspaceFolder}/tests/cmocka/include"
+                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/"
             ],
-            "compileCommands": "${workspaceFolder}/tests/cmocka/build/compile_commands.json",
             "defines": [
                 "DEBUG_EVENTS",
                 "DEBUG_TICKS",
@@ -27,8 +26,9 @@
             "cStandard": "c11",
             "cppStandard": "c++17",
             "intelliSenseMode": "gcc-x64",
-            "configurationProvider": "ms-vscode.makefile-tools"
+            "configurationProvider": "ms-vscode.cpptools",
+            "compilerPath": "${workspaceFolder}/utils/docker-gcc"
         }
     ],
     "version": 4
-}
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
     {
       "label": "Build",
       "type": "shell",
-      "command": "./docker-make clean all",
+      "command": "./docker-make all",
       "problemMatcher": ["$gcc"],
       "group": {
         "kind": "build",

diff --git a/utils/docker-gcc b/utils/docker-gcc
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+SCRIPT_DIR="$(dirname $0)"
+
+${SCRIPT_DIR}/docker-run gcc "$@"