.github/workflows/cmake.yml

@@ -13,20 +13,23 @@ jobs:
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }}-${{ matrix.cc }}
     strategy:
       matrix:
         include:
           - os: macos-latest
+            name: "macOS Clang"
             cc: "clang"
             cxx: "clang++"
           - os: ubuntu-latest
+            name: "Ubuntu Clang"
             cc: "clang-9"
             cxx: "clang++-9"
           - os: ubuntu-latest
+            name: "Ubuntu GCC"
             cc: "gcc-10"
             cxx: "g++-10"
           - os: windows-latest
+            name: "Windows MSVC"
             cc: "cl"
             cxx: "cl"
 

CMakeLists.txt

@@ -30,6 +30,7 @@ target_compile_features(python_rgbcx PUBLIC cxx_std_20 c_std_11)
 target_compile_features(test_rgbcx PUBLIC cxx_std_20 c_std_11)
 
 set_property(TARGET python_rgbcx test_rgbcx PROPERTY INTERPROCEDURAL_OPTIMIZATION True) #enable FLTO if available
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set_property(TARGET python_rgbcx test_rgbcx PROPERTY OSX_ARCHITECTURES_RELEASE x86_64 arm64) #Mach-O fat binary for arm and x86
 endif ()

src/blocks.cpp

@@ -18,5 +18,8 @@
  */
 
 #include "blocks.h"
+#include "color.h"
+#include <algorithm>
+#include <cassert>
 
 // endregion

src/blocks.h

@@ -25,6 +25,7 @@
 #include <cstdlib>
 
 #include "color.h"
+#include "util.h"
 
 #pragma pack(push, 1)
 class BC1Block {

src/color.cpp

@@ -18,12 +18,9 @@
  */
 
 #include "color.h"
-
 #include <algorithm>
 #include <cassert>
 
-#include "util.h"
-
 // region Color32 implementation
 Color32::Color32() { set(0, 0, 0, 0xFF); }
 

src/color.h

@@ -18,11 +18,14 @@
  */
 
 #pragma once
+#include "util.h"
+#include <cassert>
 #include <cstdint>
+#include <cstdlib>
 
 #pragma pack(push, 1)
 class Color32 {
-   public:
+  public:
     union {
         struct {
             uint8_t R;

src/rgbcx.cpp

@@ -4,12 +4,11 @@
 #include "rgbcx.h"
 
 #include <algorithm>
-#include <array>
 #include <cassert>
 #include <climits>
 #include <cmath>
+#include <cstdlib>
 #include <cstring>
-#include <type_traits>
 
 #include "blocks.h"
 #include "color.h"