diff --git a/.gitignore b/.gitignore index 1a7caa086..3fddca04d 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,6 @@ ModelManifest.xml *.cso *.wishadermeta wiShaderdump.h + +# vscode +.vscode/settings.json \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 97c659a28..915c80e10 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,8 +4,8 @@ { "label": "Build Debug", "type": "shell", - "command": "cmake -B build -DCMAKE_BUILD_TYPE=Debug; cd build; make -j`nproc`", - "problemMatcher": ["gcc"], + "command": "cmake -B Build -DCMAKE_BUILD_TYPE=Debug; cmake --build Build -j$(nproc)", + "problemMatcher": ["cmake"], "group": { "kind": "build" } @@ -13,8 +13,8 @@ { "label": "Build Release", "type": "shell", - "command": "cmake -B build -DCMAKE_BUILD_TYPE=Release; cd build; make -j`nproc`", - "problemMatcher": ["gcc"], + "command": "cmake -B Build -DCMAKE_BUILD_TYPE=Release; cmake --build Build -j$(nproc)", + "problemMatcher": ["cmake"], "group": { "kind": "build", "isDefault": true @@ -24,7 +24,7 @@ "CMake": { "cmake.configureOnOpen": true, - "cmake.buildDirectory": "${workspaceFolder}/build", + "cmake.buildDirectory": "${workspaceFolder}/Build", "cmake.buildTask": true } } \ No newline at end of file