MacOS fixes

Author: Stovent

README.md

@@ -104,6 +104,8 @@ The CMake options below controls how to build CeDImu and the build macros listed
 
 `LIBCEDIMU_ENABLE_ASAN`: if true, uses address sanitizer for GCC and clang (MSVC not yet supported) (default: `OFF`).
 
+`LIBCEDIMU_REBUILD_SOFTCDI`: If ON, will build the SoftCDI modules from sources (requires DOSBox). If OFF, will use the prebuilt module binaries (default: `OFF`).
+
 `CEDIMU_BUILD_CDITOOL`: If ON, builds the little `cditool` program (Linux only, requires libcdio) (default: `OFF`).
 
 `CEDIMU_BENCHMARKS`: if ON, builds the benchmarks (default: `OFF`).
@@ -114,8 +116,6 @@ The CMake options below controls how to build CeDImu and the build macros listed
 
 `CEDIMU_ENABLE_LTO`: If ON, compiles the executable with link-time optimisations (default: `ON`).
 
-`LIBCEDIMU_REBUILD_SOFTCDI`: If ON, will build the SoftCDI modules from sources (requires DOSBox). If OFF, will use the prebuilt module binaries (default: `OFF`).
-
 #### Windows
 
 First install [CMake](https://cmake.org/download/) and [vcpkg](https://github.com/microsoft/vcpkg/), and use vcpkg to install wxWidgets: `vcpkg.exe install wxwidgets:x64-windows-static`

src/CDI/CDI.cpp

@@ -3,6 +3,8 @@
 #include "boards/Mono3SoftCDI/Mono3SoftCDI.hpp"
 #include "boards/SoftCDI/SoftCDI.hpp"
 
+#include <version>
+
 /** \brief Creates a new CD-i instance.
  * \param board The type of board to use.
  * \param useSoftCDI false to use the regular LLE emulator, true to use some SoftCDI modules.
@@ -176,11 +178,20 @@ std::span<const uint8_t> CDI::GetPointer(const uint32_t addr) const noexcept
 {
     const RAMBank ram1 = GetRAMBank1();
     if(addr >= ram1.base && addr < ram1.base + ram1.data.size())
+#if __cpp_lib_ranges_as_const >= 202207L
         return {ram1.data.cbegin() + (addr - ram1.base), ram1.data.cend()};
+#else
+        return {ram1.data.begin() + (addr - ram1.base), ram1.data.end()};
+#endif
+    // LLVM doesn't implement it yet.
 
     const RAMBank ram2 = GetRAMBank2();
     if(addr >= ram2.base && addr < ram2.base + ram2.data.size())
+#if __cpp_lib_ranges_as_const >= 202207L
         return {ram2.data.cbegin() + (addr - ram2.base), ram2.data.cend()};
+#else
+        return {ram2.data.begin() + (addr - ram2.base), ram2.data.end()};
+#endif
 
     const OS9::BIOS& bios = GetBIOS();
     const uint32_t base = GetBIOSBaseAddress();

src/CDI/common/utils.hpp

@@ -6,6 +6,7 @@
 #define CDI_COMMON_UTILS_HPP
 
 #include <algorithm>
+#include <bit>
 #include <concepts>
 #include <cstdint>
 #include <cstring>