From f0d64dcdc9135146ba1e66e4c529b837be3919eb Mon Sep 17 00:00:00 2001
From: iridiumR <i@iridium.cyou>
Date: Sat, 12 Mar 2022 12:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BC=96=E8=AF=91=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => Code}/.vscode/c_cpp_properties.json  |  0
 SoftwareDesign/{ => Code}/.vscode/launch.json |  2 +-
 .../{ => Code}/.vscode/settings.json          | 32 ++++++++++---------
 SoftwareDesign/{ => Code}/.vscode/tasks.json  |  0
 .../{ => Code}/workspace.code-workspace       |  0
 5 files changed, 18 insertions(+), 16 deletions(-)
 rename SoftwareDesign/{ => Code}/.vscode/c_cpp_properties.json (100%)
 rename SoftwareDesign/{ => Code}/.vscode/launch.json (89%)
 rename SoftwareDesign/{ => Code}/.vscode/settings.json (71%)
 rename SoftwareDesign/{ => Code}/.vscode/tasks.json (100%)
 rename SoftwareDesign/{ => Code}/workspace.code-workspace (100%)

diff --git a/SoftwareDesign/.vscode/c_cpp_properties.json b/SoftwareDesign/Code/.vscode/c_cpp_properties.json
similarity index 100%
rename from SoftwareDesign/.vscode/c_cpp_properties.json
rename to SoftwareDesign/Code/.vscode/c_cpp_properties.json
diff --git a/SoftwareDesign/.vscode/launch.json b/SoftwareDesign/Code/.vscode/launch.json
similarity index 89%
rename from SoftwareDesign/.vscode/launch.json
rename to SoftwareDesign/Code/.vscode/launch.json
index c9d7a3b..4522581 100644
--- a/SoftwareDesign/.vscode/launch.json
+++ b/SoftwareDesign/Code/.vscode/launch.json
@@ -10,7 +10,7 @@
             "stopAtEntry": true, // 设为true时程序将暂停在程序入口处，我一般设置为true
             "cwd": "C:/Project/LLVM/bin",//自己的编译器路径，自行修改
             "environment": [],
-            "externalConsole": true, // 调试时是否显示控制台窗口，一般设置为true显示控制台
+            "externalConsole": false, // 调试时是否显示控制台窗口，一般设置为true显示控制台
             "MIMode": "gdb",
             "miDebuggerPath": "C:\\Project\\LLVM\\bin\\gdb.exe",//自己的gdb路径，自行修改
             "setupCommands": [
diff --git a/SoftwareDesign/.vscode/settings.json b/SoftwareDesign/Code/.vscode/settings.json
similarity index 71%
rename from SoftwareDesign/.vscode/settings.json
rename to SoftwareDesign/Code/.vscode/settings.json
index 2291ef1..578663a 100644
--- a/SoftwareDesign/.vscode/settings.json
+++ b/SoftwareDesign/Code/.vscode/settings.json
@@ -5,10 +5,11 @@
 
     "code-runner.runInTerminal": true, // 设置成false会在“输出”中输出，无法输入
     "code-runner.executorMap": {
+        
         // "c": "cd $dir && gcc *.c -o $fileNameWithoutExt.exe && $dir$fileNameWithoutExt.exe",
         // "cpp": "cd $dir && g++ *.cpp -o $fileNameWithoutExt.exe  && $dir$fileNameWithoutExt.exe"
         "c": "cd $dir && gcc *.c -fexec-charset=gb2312 -o $fileNameWithoutExt.exe && $dir$fileNameWithoutExt.exe",
-        "cpp": "cd $dir && g++ *.cpp -fexec-charset=gb2312 -o $fileNameWithoutExt.exe  && $dir$fileNameWithoutExt.exe"
+        "cpp": "cd $dir && g++ *.cpp -std=c++17 -fexec-charset=gb2312 -o $fileNameWithoutExt.exe  && $dir$fileNameWithoutExt.exe"
         // "c": "cd $dir && clang $fileName -o $fileNameWithoutExt.exe -Wall -g -Og -static-libgcc -fcolor-diagnostics --target=x86_64-w64-mingw -std=c11 && $dir$fileNameWithoutExt",
         // "cpp": "cd $dir && clang++ *.cpp -o $fileNameWithoutExt.exe -Wall -g -Og -static-libgcc -fcolor-diagnostics --target=x86_64-w64-mingw-g++ -std=c++17 && $dir$fileNameWithoutExt"
     }, // 设置code runner的命令行
@@ -18,19 +19,20 @@
 
     "C_Cpp.clang_format_sortIncludes": true, // 格式化时调整include的顺序（按字母排序）
     "C_Cpp.intelliSenseEngine": "Default", // 可以为Default或Tag Parser，后者较老，功能较简单。具体差别参考cpptools扩展文档
-    // "C_Cpp.errorSquiggles": "Disabled", // 因为有clang的lint，所以关掉
-    // "C_Cpp.autocomplete": "Disabled", // 因为有clang的补全，所以关掉
+    "C_Cpp.errorSquiggles": "Disabled", // 因为有clang的lint，所以关掉
+    "C_Cpp.autocomplete": "Disabled", // 因为有clang的补全，所以关掉
 
-    // "clang.cflags": [ // 控制c语言静态检测的参数
-    //     "--target=x86_64-w64-mingw",
-    //     "-std=c11",
-    //     "-Wall"
-    // ],
-    // "clang.cxxflags": [ // 控制c++静态检测时的参数
-    //     "--target=x86_64-w64-mingw",
-    //     "-std=c++17",
-    //     "-Wall"
-    // ],
-    // "clang.completion.enable": true,
-    "C_Cpp.default.compilerPath": "C:/Program Files/LLVM/bin/gcc.exe" // 效果效果比cpptools要好
+    "clang.cflags": [ // 控制c语言静态检测的参数
+        "--target=x86_64-w64-mingw",
+        "-std=c11",
+        "-Wall"
+    ],
+    "clang.cxxflags": [ // 控制c++静态检测时的参数
+        "--target=x86_64-w64-mingw",
+        "-std=c++17",
+        "-Wall"
+    ],
+    "clang.completion.enable": true,
+    "C_Cpp.default.compilerPath": "C:/Program Files/LLVM/bin/gcc.exe",
+    // "C_Cpp.clang_format_fallbackStyle": "LLVM" // 效果效果比cpptools要好
 }
diff --git a/SoftwareDesign/.vscode/tasks.json b/SoftwareDesign/Code/.vscode/tasks.json
similarity index 100%
rename from SoftwareDesign/.vscode/tasks.json
rename to SoftwareDesign/Code/.vscode/tasks.json
diff --git a/SoftwareDesign/workspace.code-workspace b/SoftwareDesign/Code/workspace.code-workspace
similarity index 100%
rename from SoftwareDesign/workspace.code-workspace
rename to SoftwareDesign/Code/workspace.code-workspace