From 184dcfb2caf3583b1b35be320651d351729b8edf Mon Sep 17 00:00:00 2001 From: Hanno Date: Wed, 27 Jan 2021 08:49:40 +0100 Subject: [PATCH] Add ClangCL toolset --- .github/workflows/continous_integration.yml | 12 +++++++++--- src/injected/ui.cpp | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continous_integration.yml b/.github/workflows/continous_integration.yml index 028ca297e..a6788b10d 100644 --- a/.github/workflows/continous_integration.yml +++ b/.github/workflows/continous_integration.yml @@ -8,11 +8,17 @@ on: jobs: build: - name: Continuous Integration ${{ matrix.build_type }} + name: Continuous Integration ${{ matrix.build_type }} ${{ matrix.toolset_name }} runs-on: windows-latest strategy: matrix: build_type: [Debug, Release] + toolset: [v142, ClangCL] + include: + - toolset: v142 + tooset_name: MSVC + - toolset: ClangCL + tooset_name: clang-cl steps: - uses: actions/checkout@v2 @@ -24,9 +30,9 @@ jobs: run: | mkdir build cd build - cmake .. + cmake .. -A x64 -T ${{ matrix.toolset }} - name: Build run: | cd build - cmake --build . --config ${{matrix.build_type}} --target ALL_BUILD + cmake --build . --config ${{ matrix.build_type }} --target ALL_BUILD diff --git a/src/injected/ui.cpp b/src/injected/ui.cpp index e745e381b..4f6576f8c 100644 --- a/src/injected/ui.cpp +++ b/src/injected/ui.cpp @@ -2792,7 +2792,7 @@ PresentPtr &vtable_find(T *obj, int index) { void ***ptr = reinterpret_cast(obj); if (!ptr[0]) - return *reinterpret_cast(nullptr); + return *static_cast(nullptr); return *reinterpret_cast(&ptr[0][index]); }