From e23baa6ce7a6711b0ede661747435b1b975e6d3c Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 8 Jan 2021 15:12:29 +0000 Subject: [PATCH 1/2] Basic VS Code config --- .vscode/c_cpp_properties.json | 18 ++++++++++++++++++ .vscode/cmake-kits.json | 6 ++++++ .vscode/settings.json | 5 +++++ 3 files changed, 29 insertions(+) create mode 100644 .vscode/c_cpp_properties.json create mode 100644 .vscode/cmake-kits.json create mode 100644 .vscode/settings.json diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..9b71b57 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/**", + "${env:PATH_32BLIT}" + ], + "defines": [], + "compilerPath": "/usr/bin/gcc", + "cStandard": "gnu17", + "cppStandard": "gnu++14", + "intelliSenseMode": "gcc-x64", + "configurationProvider": "ms-vscode.cmake-tools" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json new file mode 100644 index 0000000..2d79cf5 --- /dev/null +++ b/.vscode/cmake-kits.json @@ -0,0 +1,6 @@ +[ + { + "name": "32blit", + "toolchainFile": "${env:PATH_32BLIT}/32blit.toolchain" + } +] \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..f60c98f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cmake.configureSettings": { + "32BLIT_PATH": "${env:PATH_32BLIT}" + } +} \ No newline at end of file From 90f3608b2da19174fe2ebc291fa7da941b0dc381 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 8 Jan 2021 15:29:50 +0000 Subject: [PATCH 2/2] Use CMake Tools as config provider --- .gitignore | 1 + .vscode/c_cpp_properties.json | 18 ------------------ .vscode/settings.json | 3 ++- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json diff --git a/.gitignore b/.gitignore index e3f69b1..8ef786c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ build.em/ build.stm32/ +.vscode/settings.json diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index 9b71b57..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux", - "includePath": [ - "${workspaceFolder}/**", - "${env:PATH_32BLIT}" - ], - "defines": [], - "compilerPath": "/usr/bin/gcc", - "cStandard": "gnu17", - "cppStandard": "gnu++14", - "intelliSenseMode": "gcc-x64", - "configurationProvider": "ms-vscode.cmake-tools" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index f60c98f..ead1aa4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "cmake.configureSettings": { "32BLIT_PATH": "${env:PATH_32BLIT}" - } + }, + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools" } \ No newline at end of file