From c30faaaab75272e208ef6e62ad4456f80913976b Mon Sep 17 00:00:00 2001 From: William Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Fri, 18 Apr 2025 16:52:05 +0100 Subject: [PATCH 1/7] Alter Height and Width --- src/plugin/radarscreen/ScreenControls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin/radarscreen/ScreenControls.h b/src/plugin/radarscreen/ScreenControls.h index 6ea30b482..548aa8ac9 100644 --- a/src/plugin/radarscreen/ScreenControls.h +++ b/src/plugin/radarscreen/ScreenControls.h @@ -55,10 +55,10 @@ namespace UKControllerPlugin::RadarScreen { const int toggleboxIdEuroscope; // Height for each control - const int controlHeight = 25; + const int controlHeight = 20; // Width for each control - const int controlWidth = 25; + const int controlWidth = 20; // Title for the options const std::string menuName = "UKCP Options"; From cfa4b4260b47feda04836ed8f3f8310c144b34a9 Mon Sep 17 00:00:00 2001 From: William Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Sat, 19 Apr 2025 18:36:43 +0100 Subject: [PATCH 2/7] Update CMakeLists for Windows Build --- CMakeSettings.json | 74 +++++++++++++++++++++++++++++++++++++ src/loader/CMakeLists.txt | 1 + src/plugin/CMakeLists.txt | 1 + src/updater/CMakeLists.txt | 1 + test/loader/CMakeLists.txt | 1 + test/plugin/CMakeLists.txt | 1 + test/updater/CMakeLists.txt | 1 + 7 files changed, 80 insertions(+) create mode 100644 CMakeSettings.json diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 000000000..92f5eade3 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,74 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Release", + "inheritEnvironments": [ "msvc_x86" ], + "buildRoot": "${projectDir}\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "cmakeToolchain": "C:/Users/willi/Downloads/WindowsToolchain-main/Windows.Clang.toolchain.cmake", + "cmakeExecutable": "C:/Program Files/CMake/bin/cmake.exe", + "variables": [ + { + "name": "CMAKE_CXX_COMPILER_AR", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-lib.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_C_COMPILER", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe", + "type": "STRING" + }, + { + "name": "CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-scan-deps.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_CXX_COMPILER_RANLIB", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-ranlib.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_CXX_FLAGS", + "value": "/X /DWIN32 /D_WINDOWS /GR /EHsc", + "type": "STRING" + }, + { + "name": "CMAKE_LINKER", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/lld-link.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "C:/Users/willi/AppData/Local/Microsoft/WinGet/Links/ninja.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_NM", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-nm.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_AR", + "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-lib.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "True", + "type": "BOOL" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt index 4f0b4a133..90d3612ca 100644 --- a/src/loader/CMakeLists.txt +++ b/src/loader/CMakeLists.txt @@ -107,6 +107,7 @@ if(MSVC) /sdl; /W4; /WX; + -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt index 8a5c76ddb..9f7180d92 100644 --- a/src/plugin/CMakeLists.txt +++ b/src/plugin/CMakeLists.txt @@ -1139,6 +1139,7 @@ if(MSVC) /sdl; /W4; /WX; + -Wno-vla-cxx-extension; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; /Zm200; ${DEFAULT_CXX_EXCEPTION_HANDLING} diff --git a/src/updater/CMakeLists.txt b/src/updater/CMakeLists.txt index 597fc1a08..97d6fe633 100644 --- a/src/updater/CMakeLists.txt +++ b/src/updater/CMakeLists.txt @@ -107,6 +107,7 @@ if(MSVC) /sdl; /W4; /WX; + -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/test/loader/CMakeLists.txt b/test/loader/CMakeLists.txt index c84f769db..305e01be2 100644 --- a/test/loader/CMakeLists.txt +++ b/test/loader/CMakeLists.txt @@ -102,6 +102,7 @@ if(MSVC) /std:c++20; /W4; /WX; + -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/test/plugin/CMakeLists.txt b/test/plugin/CMakeLists.txt index 78d770a3e..f00500261 100644 --- a/test/plugin/CMakeLists.txt +++ b/test/plugin/CMakeLists.txt @@ -775,6 +775,7 @@ if(MSVC) /sdl; /W4; /WX; + -Wno-vla-cxx-extension; -ftime-trace; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} diff --git a/test/updater/CMakeLists.txt b/test/updater/CMakeLists.txt index 396f5f329..97fb6b586 100644 --- a/test/updater/CMakeLists.txt +++ b/test/updater/CMakeLists.txt @@ -107,6 +107,7 @@ if(MSVC) /std:c++20; /W4; /WX; + -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) target_link_options(${PROJECT_NAME} PRIVATE From 775b1f91ad3bdc29c87012d9777410244eaebbe5 Mon Sep 17 00:00:00 2001 From: William Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Fri, 18 Apr 2025 16:52:05 +0100 Subject: [PATCH 3/7] Alter Height and Width --- src/plugin/radarscreen/ScreenControls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin/radarscreen/ScreenControls.h b/src/plugin/radarscreen/ScreenControls.h index 6ea30b482..548aa8ac9 100644 --- a/src/plugin/radarscreen/ScreenControls.h +++ b/src/plugin/radarscreen/ScreenControls.h @@ -55,10 +55,10 @@ namespace UKControllerPlugin::RadarScreen { const int toggleboxIdEuroscope; // Height for each control - const int controlHeight = 25; + const int controlHeight = 20; // Width for each control - const int controlWidth = 25; + const int controlWidth = 20; // Title for the options const std::string menuName = "UKCP Options"; From eb6e2aaacbbb5350fda3dff1f9a0eb493d2abd9e Mon Sep 17 00:00:00 2001 From: William Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Sat, 19 Apr 2025 18:50:23 +0100 Subject: [PATCH 4/7] Revert Rebase --- src/loader/CMakeLists.txt | 1 - src/plugin/CMakeLists.txt | 1 - src/updater/CMakeLists.txt | 1 - test/loader/CMakeLists.txt | 1 - test/plugin/CMakeLists.txt | 1 - test/updater/CMakeLists.txt | 1 - 6 files changed, 6 deletions(-) diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt index 90d3612ca..4f0b4a133 100644 --- a/src/loader/CMakeLists.txt +++ b/src/loader/CMakeLists.txt @@ -107,7 +107,6 @@ if(MSVC) /sdl; /W4; /WX; - -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt index 9f7180d92..8a5c76ddb 100644 --- a/src/plugin/CMakeLists.txt +++ b/src/plugin/CMakeLists.txt @@ -1139,7 +1139,6 @@ if(MSVC) /sdl; /W4; /WX; - -Wno-vla-cxx-extension; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; /Zm200; ${DEFAULT_CXX_EXCEPTION_HANDLING} diff --git a/src/updater/CMakeLists.txt b/src/updater/CMakeLists.txt index 97d6fe633..597fc1a08 100644 --- a/src/updater/CMakeLists.txt +++ b/src/updater/CMakeLists.txt @@ -107,7 +107,6 @@ if(MSVC) /sdl; /W4; /WX; - -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/test/loader/CMakeLists.txt b/test/loader/CMakeLists.txt index 305e01be2..c84f769db 100644 --- a/test/loader/CMakeLists.txt +++ b/test/loader/CMakeLists.txt @@ -102,7 +102,6 @@ if(MSVC) /std:c++20; /W4; /WX; - -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) diff --git a/test/plugin/CMakeLists.txt b/test/plugin/CMakeLists.txt index f00500261..78d770a3e 100644 --- a/test/plugin/CMakeLists.txt +++ b/test/plugin/CMakeLists.txt @@ -775,7 +775,6 @@ if(MSVC) /sdl; /W4; /WX; - -Wno-vla-cxx-extension; -ftime-trace; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} diff --git a/test/updater/CMakeLists.txt b/test/updater/CMakeLists.txt index 97fb6b586..396f5f329 100644 --- a/test/updater/CMakeLists.txt +++ b/test/updater/CMakeLists.txt @@ -107,7 +107,6 @@ if(MSVC) /std:c++20; /W4; /WX; - -Wno-cast-function-type-mismatch; ${DEFAULT_CXX_EXCEPTION_HANDLING} ) target_link_options(${PROJECT_NAME} PRIVATE From c92291852767e68b49db1691a483168c816fd144 Mon Sep 17 00:00:00 2001 From: Will Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Sat, 19 Apr 2025 18:51:20 +0100 Subject: [PATCH 5/7] Delete CMakeSettings.json --- CMakeSettings.json | 74 ---------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 CMakeSettings.json diff --git a/CMakeSettings.json b/CMakeSettings.json deleted file mode 100644 index 92f5eade3..000000000 --- a/CMakeSettings.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "configurations": [ - { - "name": "x64-Debug", - "generator": "Ninja", - "configurationType": "Release", - "inheritEnvironments": [ "msvc_x86" ], - "buildRoot": "${projectDir}\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "cmakeToolchain": "C:/Users/willi/Downloads/WindowsToolchain-main/Windows.Clang.toolchain.cmake", - "cmakeExecutable": "C:/Program Files/CMake/bin/cmake.exe", - "variables": [ - { - "name": "CMAKE_CXX_COMPILER_AR", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-lib.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_C_COMPILER", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_CXX_COMPILER", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe", - "type": "STRING" - }, - { - "name": "CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/clang-scan-deps.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_CXX_COMPILER_RANLIB", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-ranlib.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_CXX_FLAGS", - "value": "/X /DWIN32 /D_WINDOWS /GR /EHsc", - "type": "STRING" - }, - { - "name": "CMAKE_LINKER", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/lld-link.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_MAKE_PROGRAM", - "value": "C:/Users/willi/AppData/Local/Microsoft/WinGet/Links/ninja.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_NM", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-nm.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_AR", - "value": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/llvm-lib.exe", - "type": "FILEPATH" - }, - { - "name": "CMAKE_EXPORT_COMPILE_COMMANDS", - "value": "True", - "type": "BOOL" - } - ] - } - ] -} \ No newline at end of file From 586ca0a528f0ec7a668572b816da4743bb1c6a43 Mon Sep 17 00:00:00 2001 From: William Hinshaw <61280994+Hinshee@users.noreply.github.com> Date: Fri, 6 Jun 2025 17:24:46 +0100 Subject: [PATCH 6/7] Update Height and Width --- src/plugin/radarscreen/ScreenControls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin/radarscreen/ScreenControls.h b/src/plugin/radarscreen/ScreenControls.h index 548aa8ac9..964754495 100644 --- a/src/plugin/radarscreen/ScreenControls.h +++ b/src/plugin/radarscreen/ScreenControls.h @@ -55,10 +55,10 @@ namespace UKControllerPlugin::RadarScreen { const int toggleboxIdEuroscope; // Height for each control - const int controlHeight = 20; + const int controlHeight = 22; // Width for each control - const int controlWidth = 20; + const int controlWidth = 22; // Title for the options const std::string menuName = "UKCP Options"; From cbd64c8138cf38a8ea92d9de6df86af6383ef4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristi=C3=A1n=20Kunc?= Date: Mon, 26 Jan 2026 16:12:23 +0100 Subject: [PATCH 7/7] merge main to feature --- .github/workflows/build.yml | 22 +++++++++++----------- CMakeLists.txt | 8 ++++++++ docs/UserGuide/Changelog/Changelog.md | 7 +++++++ yarn.lock | 6 +++--- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fb7a76fa..274aba201 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: cancel-in-progress: true steps: - name: Checkout Code and Submodules - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: recursive @@ -41,7 +41,7 @@ jobs: # cURL - name: Cache cURL id: cache-curl - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "C:\\hostedtoolcache\\windows\\libcurl" key: "ukcp-curl-build" @@ -79,7 +79,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v4 + uses: actions/cache@v5 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -88,7 +88,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "**/node_modules" key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} @@ -136,19 +136,19 @@ jobs: # Upload artifacts - name: Upload Core Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPluginCore.dll path: ".\\build\\bin\\UKControllerPluginCore.dll" - name: Upload Updater Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPluginUpdater.dll path: ".\\build\\bin\\UKControllerPluginUpdater.dll" - name: Upload Loader Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPlugin.dll path: ".\\build\\bin\\UKControllerPlugin.dll" @@ -161,7 +161,7 @@ jobs: cancel-in-progress: true steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: persist-credentials: false @@ -193,7 +193,7 @@ jobs: cancel-in-progress: false steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: persist-credentials: false @@ -208,7 +208,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v4 + uses: actions/cache@v5 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -217,7 +217,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "**/node_modules" key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} diff --git a/CMakeLists.txt b/CMakeLists.txt index ff79c703f..f1f647249 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,14 @@ if(MSVC) set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}") endif() +################################################################################ +# Global compile definitions for all targets +################################################################################ +add_compile_definitions( + $<$:_DEBUG> + $<$:NDEBUG> +) + ################################################################################ # Nuget packages function stub. ################################################################################ diff --git a/docs/UserGuide/Changelog/Changelog.md b/docs/UserGuide/Changelog/Changelog.md index 794d7d835..5341382fc 100644 --- a/docs/UserGuide/Changelog/Changelog.md +++ b/docs/UserGuide/Changelog/Changelog.md @@ -1,5 +1,12 @@ # UK Controller Plugin Changelog +## [5.18.1](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.18.0...5.18.1) (2025-12-01) + + +### Bug Fixes + +* configure debug options compile targets ([b21d96b](https://github.com/VATSIM-UK/uk-controller-plugin/commit/b21d96b8099bb7f054c9d164d52bffb1d1fdf87f)) + # [5.18.0](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.17.4...5.18.0) (2025-11-03) diff --git a/yarn.lock b/yarn.lock index 45f7be4e2..5a66ad03a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2226,9 +2226,9 @@ lodash.uniqby@^4.7.0: integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + version "4.17.23" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a" + integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w== longest@^2.0.1: version "2.0.1"