From d5d86a58c672fdb2ee65e6c5b76c124813ff7b53 Mon Sep 17 00:00:00 2001 From: Felisware <107019287+felisware@users.noreply.github.com> Date: Sat, 15 Oct 2022 21:47:55 +0700 Subject: [PATCH] Edit VScode config --- .vscode/c_cpp_properties.json | 6 +++ .vscode/tasks.json | 84 ++++++++++++++++++----------------- App/next update.txt | 4 -- 3 files changed, 49 insertions(+), 45 deletions(-) delete mode 100644 App/next update.txt diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index a43cba1..5dc3065 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,16 +3,22 @@ { "name": "Win32", "includePath": [ + //add your wxwidgets library include (manual) "${env:WXWIN}\\include", + //you can use any CPU type (32/64/arm) "${env:WXWIN}\\lib\\gcc_lib_64\\mswu", + + //this default (automatic) "${workspaceFolder}\\include", "${workspaceFolder}/**" ], + "defines": [ "_DEBUG", "UNICODE", "_UNICODE" ], + "compilerPath": "C:/Program Files/mingw64/bin/g++.exe", "cStandard": "gnu17", "cppStandard": "gnu++17", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 159640e..8e8a00e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,8 +3,49 @@ "tasks": [ { - "type": "process", "label": "Build 32Bit", + "dependsOn": ["Compile Resources 32Bit", "Compile software 32Bit"], + "group": { + "kind": "build", + "isDefault": true + } + }, + + { + "label": "Build 64Bit", + "dependsOn": ["Compile Resources 64Bit", "Compile software 64Bit"], + "group": { + "kind": "build", + "isDefault": true + } + }, + + { + "type": "process", + "label": "Compile Resources 32Bit", + "command": "C:\\PROGRA~1\\mingw64\\bin\\windres.exe", + "args": [ + "-i", "${workspaceFolder}\\resources.rc", + "-o", "${workspaceFolder}\\Assets\\Bin\\resources32.o", + "-I", "${env:WXWIN}\\include", + "--target=pe-i386" + ], + }, + + { + "type": "process", + "label": "Compile Resources 64Bit", + "command": "C:\\PROGRA~1\\mingw64\\bin\\windres.exe", + "args": [ + "-i", "${workspaceFolder}\\resources.rc", + "-o", "${workspaceFolder}\\Assets\\Bin\\resources64.o", + "-I", "${env:WXWIN}\\include" + ], + }, + + { + "type": "process", + "label": "Compile software 32Bit", "command": "g++.exe", "args": [ "${workspaceFolder}\\Src\\*.cpp", "${workspaceFolder}\\Assets\\Bin\\resources32.o", @@ -23,15 +64,11 @@ "-lwxmsw32u_core", "-lwxbase32u", "-lwxpng", "-lwxzlib", "-lcomdlg32", "-lgdi32", "-lcomctl32", "-lole32", "-loleaut32", "-ldmoguids", "-luuid", "-lwinspool", "-lz", "-luxtheme", "-loleacc", "-lshlwapi", "-lversion", "-liphlpapi" ], - "group": { - "kind": "build", - "isDefault": true - } }, { "type": "process", - "label": "Build 64Bit", + "label": "Compile software 64Bit", "command": "g++.exe", "args": [ "${workspaceFolder}\\Src\\*.cpp", "${workspaceFolder}\\Assets\\Bin\\resources64.o", @@ -50,41 +87,6 @@ "-lwxmsw32u_core", "-lwxbase32u", "-lwxpng", "-lwxzlib", "-lcomdlg32", "-lgdi32", "-lcomctl32", "-lole32", "-loleaut32", "-ldmoguids", "-luuid", "-lwinspool", "-lz", "-luxtheme", "-loleacc", "-lshlwapi", "-lversion", "-liphlpapi" ], - "group": { - "kind": "build", - "isDefault": true - } - }, - - { - "type": "process", - "label": "Compile Resources 32Bit", - "command": "C:\\PROGRA~1\\mingw64\\bin\\windres.exe", - "args": [ - "-i", "${workspaceFolder}\\resources.rc", - "-o", "${workspaceFolder}\\Assets\\Bin\\resources32.o", - "-I", "${env:WXWIN}\\include", - "--target=pe-i386" - ], - "group": { - "kind": "build", - "isDefault": true - } - }, - - { - "type": "process", - "label": "Compile Resources 64Bit", - "command": "C:\\PROGRA~1\\mingw64\\bin\\windres.exe", - "args": [ - "-i", "${workspaceFolder}\\resources.rc", - "-o", "${workspaceFolder}\\Assets\\Bin\\resources64.o", - "-I", "${env:WXWIN}\\include" - ], - "group": { - "kind": "build", - "isDefault": true - } } ] } \ No newline at end of file diff --git a/App/next update.txt b/App/next update.txt deleted file mode 100644 index e2dbbe5..0000000 --- a/App/next update.txt +++ /dev/null @@ -1,4 +0,0 @@ -2023 -1. fix memory leak -2. create Cmake build & doxygen documentation -3. new features "reveal saved wifi password" \ No newline at end of file