Add ClangCL toolset

spelunky-fyi · Jan 27, 2021 · 184dcfb · 184dcfb
1 parent bc663ad
commit 184dcfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -2792,7 +2792,7 @@ PresentPtr &vtable_find(T *obj, int index)
 {
     void ***ptr = reinterpret_cast<void ***>(obj);
     if (!ptr[0])
-        return *reinterpret_cast<PresentPtr *>(nullptr);
+        return *static_cast<PresentPtr *>(nullptr);
     return *reinterpret_cast<PresentPtr *>(&ptr[0][index]);
 }