Disable C++26 for now and fix MacOS and Windows workflows

Author: Stovent

.github/workflows/build-macos-x86_64.yml

@@ -10,11 +10,11 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install wxWidgets
-        run: brew install wxwidgets dylibbundler create-dmg
+      - name: Install dependencies
+        run: brew install wxwidgets@3.2 dylibbundler create-dmg llvm
 
       - name: Generate Makefile
-        run: cmake . -DCMAKE_BUILD_TYPE=Release
+        run: CXX=$(brew --prefix llvm)/bin/clang++ cmake . -DCMAKE_BUILD_TYPE=Release -DCEDIMU_ENABLE_LTO=OFF
 
       - name: Build
         run: make -j$(sysctl -n hw.physicalcpu)

.github/workflows/build-windows.yml

@@ -34,4 +34,4 @@ jobs:
           path: ./build/Release/CeDImu.exe
 
       - name: Run tests
-        run: ./build/tests/tests
+        run: ./build/tests/Release/tests.exe

benchmarks/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.25)
 
 project(CeDImu-benchmarks)
 
-set(CMAKE_CXX_STANDARD 26)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT CMAKE_BUILD_TYPE)

src/CDI/CMakeLists.txt

@@ -4,7 +4,7 @@ project(libCeDImu)
 
 set(CMAKE_C_STANDARD 23)
 set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_STANDARD 26)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

src/CDI/Video/Pixel.hpp

@@ -3,15 +3,15 @@
 
 #include <bit>
 #include <cstdint>
-#include <stdbit.h>
+// #include <stdbit.h>
 
-#if __STDC_VERSION_STDBIT_H__ < 202311L
-#error need __STDC_ENDIAN_NATIVE__ compiler support
-#endif
+// #if __STDC_VERSION_STDBIT_H__ < 202311L
+// #error need __STDC_ENDIAN_NATIVE__ compiler support
+// #endif
 
-#if __STDC_ENDIAN_NATIVE__ != __STDC_ENDIAN_LITTLE__ && __STDC_ENDIAN_NATIVE__ != __STDC_ENDIAN_BIG__
-#error requires a regular little-endian or big-endian machine
-#endif
+// #if __STDC_ENDIAN_NATIVE__ != __STDC_ENDIAN_LITTLE__ && __STDC_ENDIAN_NATIVE__ != __STDC_ENDIAN_BIG__
+// #error requires a regular little-endian or big-endian machine
+// #endif
 
 namespace Video
 {
@@ -20,22 +20,24 @@ namespace Video
  */
 struct alignas(uint32_t) Pixel
 {
+    static_assert(std::endian::native == std::endian::little);
+
     /** \brief Type alias to allow for raw manipulation. */
     using ARGB32 = uint32_t;
 
     constexpr Pixel() : Pixel(0) {}
 
-#if __STDC_ENDIAN_NATIVE__ == __STDC_ENDIAN_LITTLE__
+// #if __STDC_ENDIAN_NATIVE__ == __STDC_ENDIAN_LITTLE__
     constexpr Pixel(ARGB32 argb) : b(argb), g(argb >> 8), r(argb >> 16), a(argb >> 24) {}
     constexpr Pixel(uint8_t A, uint8_t R, uint8_t G, uint8_t B) : b{B}, g{G}, r{R}, a{A} {}
 
     uint8_t b, g, r, a;
-#else
-    constexpr Pixel(ARGB32 argb) : a(argb >> 24), r(argb >> 16), g(argb >> 8), b(argb) {}
-    constexpr Pixel(uint8_t A, uint8_t R, uint8_t G, uint8_t B) : a{A}, r{R}, g{G}, b{B} {}
+// #else
+//     constexpr Pixel(ARGB32 argb) : a(argb >> 24), r(argb >> 16), g(argb >> 8), b(argb) {}
+//     constexpr Pixel(uint8_t A, uint8_t R, uint8_t G, uint8_t B) : a{A}, r{R}, g{G}, b{B} {}
 
-    uint8_t a, r, g, b;
-#endif // __STDC_ENDIAN_NATIVE__
+//     uint8_t a, r, g, b;
+// #endif // __STDC_ENDIAN_NATIVE__
 
     constexpr ARGB32 AsU32() const noexcept { return static_cast<ARGB32>(*this); }
 

src/CDI/common/Audio.cpp

@@ -1,6 +1,8 @@
 #include "Audio.hpp"
 #include "utils.hpp"
 
+#include <bit>
+
 namespace Audio
 {
 

src/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 option(CEDIMU_ENABLE_LTO "Enable LTO if available" ON)
 
-set(CMAKE_CXX_STANDARD 26)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 

tests/CMakeLists.txt

@@ -1,17 +1,18 @@
-set(CMAKE_CXX_STANDARD 26)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_executable(tests
     testVideoDecoders.cpp
 )
 
-target_compile_options(tests PRIVATE -Wall -Wextra -pedantic)
 target_link_libraries(tests PRIVATE Catch2::Catch2WithMain CeDImu)
 
 option(CEDIMU_TESTS_ASAN "Add address sanitizer options for the unit tests" OFF)
 message("CeDImu tests sanitize: " ${CEDIMU_TESTS_ASAN})
 
 if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # Common flags for GCC and Clang.
+    target_compile_options(tests PRIVATE -Wall -Wextra -pedantic)
+
     if(CEDIMU_TESTS_ASAN)
         target_compile_options(tests PRIVATE -fsanitize=address)
         target_link_options(tests PUBLIC -fsanitize=address -static-libasan)