From f68e3070d092b6fe48b734f95fbd1c321918ac10 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 29 Jan 2023 19:08:19 +0100 Subject: [PATCH] Add (Partial) VSCode cpp config --- .vscode/tasks.json | 41 ++++++++++++++++ CEFInjectLib/.vscode/c_cpp_properties.json | 25 ++++++++++ CEFInjectLib/.vscode/tasks.json | 43 +++++++++++++++++ GlosSIConfig/.vscode/tasks.json | 43 +++++++++++++++++ GlosSIConfig/Resource.rc | 8 ++-- GlosSITarget/.vscode/c_cpp_properties.json | 37 ++++++++++++++ GlosSITarget/.vscode/launch.json | 22 ++++----- GlosSITarget/.vscode/settings.json | 3 -- GlosSITarget/.vscode/tasks.json | 56 ++++++++++++++++------ GlosSITarget/Resource.rc | 8 ++-- GlosSIWatchdog/.vscode/tasks.json | 41 ++++++++++++++++ Installer/Installer.nsi | 2 +- UWPOverlayEnablerDLL/.vscode/tasks.json | 41 ++++++++++++++++ common/.vscode/c_cpp_properties.json | 33 +++++++++++++ glosc.code-workspace | 15 ------ glossi.code-workspace | 42 ++++++++++++++++ 16 files changed, 405 insertions(+), 55 deletions(-) create mode 100644 .vscode/tasks.json create mode 100644 CEFInjectLib/.vscode/c_cpp_properties.json create mode 100644 CEFInjectLib/.vscode/tasks.json create mode 100644 GlosSIConfig/.vscode/tasks.json create mode 100644 GlosSITarget/.vscode/c_cpp_properties.json delete mode 100644 GlosSITarget/.vscode/settings.json create mode 100644 GlosSIWatchdog/.vscode/tasks.json create mode 100644 UWPOverlayEnablerDLL/.vscode/tasks.json create mode 100644 common/.vscode/c_cpp_properties.json delete mode 100644 glosc.code-workspace create mode 100644 glossi.code-workspace diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..931bf3d --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build Solution (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:Build", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build Solution (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/CEFInjectLib/.vscode/c_cpp_properties.json b/CEFInjectLib/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..7ce2b99 --- /dev/null +++ b/CEFInjectLib/.vscode/c_cpp_properties.json @@ -0,0 +1,25 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**", + "${workspaceFolder}/../deps/json/include", + "${workspaceFolder}/../deps/cpp-httplib", + "${workspaceFolder}/../deps/easywsclient" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE", + "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING" + ], + "windowsSdkVersion": "10.0.18362.0", + "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.24.28314/bin/Hostx64/x64/cl.exe", + "cStandard": "c11", + "cppStandard": "c++20", + "intelliSenseMode": "msvc-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/CEFInjectLib/.vscode/tasks.json b/CEFInjectLib/.vscode/tasks.json new file mode 100644 index 0000000..fda20d0 --- /dev/null +++ b/CEFInjectLib/.vscode/tasks.json @@ -0,0 +1,43 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build CEFInjectLib (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:CEFInjectLib", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build CEFInjectLib (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:CEFInjectLib:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/GlosSIConfig/.vscode/tasks.json b/GlosSIConfig/.vscode/tasks.json new file mode 100644 index 0000000..8581e9e --- /dev/null +++ b/GlosSIConfig/.vscode/tasks.json @@ -0,0 +1,43 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build GlosSIConfig (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSIConfig", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build GlosSIConfig (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSIConfig:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index 1f1efe3..cc7ca13 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,0011001030052 - PRODUCTVERSION 0,1,2,0011001030052 + FILEVERSION 0,1,2,0018002705604 + PRODUCTVERSION 0,1,2,0018002705604 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - Config" - VALUE "FileVersion", "0.1.2.0-11-g1f3fb52" + VALUE "FileVersion", "0.1.2.0-18-g27056b4" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.2.0-11-g1f3fb52" + VALUE "ProductVersion", "0.1.2.0-18-g27056b4" END END BLOCK "VarFileInfo" diff --git a/GlosSITarget/.vscode/c_cpp_properties.json b/GlosSITarget/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..b4fe885 --- /dev/null +++ b/GlosSITarget/.vscode/c_cpp_properties.json @@ -0,0 +1,37 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**", + "${workspaceFolder}/../deps/SFML/include", + "${workspaceFolder}/../deps/WinReg", + "${workspaceFolder}/../deps/spdlog/include", + "${workspaceFolder}/../deps/ValveFileVDF", + "${workspaceFolder}/../deps/subhook", + "${workspaceFolder}/../deps/ViGEmClient/include", + "${workspaceFolder}/../deps/imgui", + "${workspaceFolder}/../deps/imgui-sfml", + "${workspaceFolder}/../deps/json/include", + "${workspaceFolder}/../deps/traypp/tray/include", + "${workspaceFolder}/../deps/cpp-httplib", + "${workspaceFolder}/../CEFInjectLib" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE", + "SPDLOG_WCHAR_TO_UTF8_SUPPORT", + "SPDLOG_WCHAR_FILENAMES", + "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING", + "SUBHOOK_STATIC" + ], + "windowsSdkVersion": "10.0.18362.0", + "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.24.28314/bin/Hostx64/x64/cl.exe", + "cStandard": "c11", + "cppStandard": "c++20", + "intelliSenseMode": "msvc-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/GlosSITarget/.vscode/launch.json b/GlosSITarget/.vscode/launch.json index 67e0af6..cfbec53 100644 --- a/GlosSITarget/.vscode/launch.json +++ b/GlosSITarget/.vscode/launch.json @@ -5,24 +5,18 @@ "version": "0.2.0", "configurations": [ { - "name": "(gdb) Launch", - "type": "cppdbg", + "name": "Launch GlosSITarget", + "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build/GlosSITarget", - "preLaunchTask": "Build", - "args": [], + "program": "${workspaceFolder}/../x64/Debug/GlosSITarget.exe", + "preLaunchTask": "Build GlosSITarget (Debug)", + "args": [ + "-window" + ], "stopAtEntry": false, - "cwd": "${workspaceFolder}/build", + "cwd": "${workspaceFolder}/../x64/Debug", "environment": [], "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] } ] } \ No newline at end of file diff --git a/GlosSITarget/.vscode/settings.json b/GlosSITarget/.vscode/settings.json deleted file mode 100644 index b4d8c35..0000000 --- a/GlosSITarget/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools" -} \ No newline at end of file diff --git a/GlosSITarget/.vscode/tasks.json b/GlosSITarget/.vscode/tasks.json index 4e6bbb9..567aa16 100644 --- a/GlosSITarget/.vscode/tasks.json +++ b/GlosSITarget/.vscode/tasks.json @@ -1,15 +1,43 @@ { - "version": "2.0.0", - "tasks": [ - { - "type": "cmake", - "command": "build", - "label": "Build", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] - } - ] -} \ No newline at end of file + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build GlosSITarget (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSITarget", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build GlosSITarget (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSITarget:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index 806d632..8346603 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,0011001030052 - PRODUCTVERSION 0,1,2,0011001030052 + FILEVERSION 0,1,2,0018002705604 + PRODUCTVERSION 0,1,2,0018002705604 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.1.2.0-11-g1f3fb52" + VALUE "FileVersion", "0.1.2.0-18-g27056b4" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021-2022 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.2.0-11-g1f3fb52" + VALUE "ProductVersion", "0.1.2.0-18-g27056b4" END END BLOCK "VarFileInfo" diff --git a/GlosSIWatchdog/.vscode/tasks.json b/GlosSIWatchdog/.vscode/tasks.json new file mode 100644 index 0000000..b23e6df --- /dev/null +++ b/GlosSIWatchdog/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build GlosSIWatchdog (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSIWatchdog", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build GlosSIWatchdog (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:GlosSIWatchdog:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi index 80553ae..0d9a1dc 100644 --- a/Installer/Installer.nsi +++ b/Installer/Installer.nsi @@ -3,7 +3,7 @@ !define APP_NAME "GlosSI" !define COMP_NAME "Peter Repukat - Flatspotsoftware" !define WEB_SITE "https://glossi.flatspot.pictures/" -!define VERSION "0.1.2.0-11-g1f3fb52" +!define VERSION "0.1.2.0-18-g27056b4" !define COPYRIGHT "Peter Repukat - FlatspotSoftware © 2017-2022" !define DESCRIPTION "SteamInput compatibility tool" !define INSTALLER_NAME "GlosSI-Installer.exe" diff --git a/UWPOverlayEnablerDLL/.vscode/tasks.json b/UWPOverlayEnablerDLL/.vscode/tasks.json new file mode 100644 index 0000000..85afe38 --- /dev/null +++ b/UWPOverlayEnablerDLL/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "Build UWPOverlayEnablerDLL (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:UWPOverlayEnablerDLL", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + }, + { + "type": "shell", + "label": "Re-Build UWPOverlayEnablerDLL (Debug)", + "command": "msbuild.exe", + "args": [ + "GlosSI.sln", + "/target:UWPOverlayEnablerDLL:Rebuild", + "/p:Configuration=Debug", + "/p:Platform=x64" + ], + "options": { + "cwd": "${workspaceFolder}/..", + }, + "problemMatcher": ["$msCompile"], + "group": { + "kind": "build", + }, + } + ] + } \ No newline at end of file diff --git a/common/.vscode/c_cpp_properties.json b/common/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..a007661 --- /dev/null +++ b/common/.vscode/c_cpp_properties.json @@ -0,0 +1,33 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**", + "${workspaceFolder}/../deps/SFML/include", + "${workspaceFolder}/../deps/WinReg", + "${workspaceFolder}/../deps/spdlog/include", + "${workspaceFolder}/../deps/ValveFileVDF", + "${workspaceFolder}/../deps/subhook", + "${workspaceFolder}/../deps/ViGEmClient/include", + "${workspaceFolder}/../deps/imgui", + "${workspaceFolder}/../deps/imgui-sfml", + "${workspaceFolder}/../deps/json/include", + "${workspaceFolder}/../deps/traypp/tray/include", + "${workspaceFolder}/../deps/cpp-httplib", + "${workspaceFolder}/../CEFInjectLib" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "windowsSdkVersion": "10.0.18362.0", + "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.24.28314/bin/Hostx64/x64/cl.exe", + "cStandard": "c11", + "cppStandard": "c++20", + "intelliSenseMode": "msvc-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/glosc.code-workspace b/glosc.code-workspace deleted file mode 100644 index ba57d0b..0000000 --- a/glosc.code-workspace +++ /dev/null @@ -1,15 +0,0 @@ -{ - "folders": [ - { - "path": "GlosSIConfig" - }, - { - "path": "GlosSITarget" - }, - { - "name": "root", - "path": "." - } - ], - "settings": {} -} \ No newline at end of file diff --git a/glossi.code-workspace b/glossi.code-workspace new file mode 100644 index 0000000..8a21769 --- /dev/null +++ b/glossi.code-workspace @@ -0,0 +1,42 @@ +{ + "folders": [ + { + "path": "common" + }, + { + "path": "CEFInjectLib" + }, + { + "path": "GlosSIConfig" + }, + { + "path": "GlosSITarget" + }, + { + "path": "GlosSIWatchdog" + }, + { + "path": "UWPOverlayEnablerDLL" + }, + { + "path": "Installer" + }, + { + "name": "root", + "path": "." + }, + ], + "settings": { + // uncomment if not already in user settings and wanting to debug/build c++ code (vs 2022 required!) + // "terminal.integrated.profiles.windows": { + // "Developer PowerShell for VS 2022": { + // "source": "PowerShell", + // "icon": "terminal-powershell", + // "args": [ + // "-c", + // "$vsPath = & '${env:ProgramFiles(x86)}/Microsoft Visual Studio/Installer/vswhere.exe' -property installationpath; Import-Module \"$vsPath/Common7/Tools/Microsoft.VisualStudio.DevShell.dll\"; Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation; powershell.exe" + // ] + // } + // }, + } +} \ No newline at end of file