diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e04976f..afd0d519 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,16 +29,16 @@ jobs: fail-fast: false matrix: include: - - name: "Ubuntu 22.04 (GCC)" + - name: "Ubuntu 22.04 (GCC-12)" os: ubuntu-22.04 - cc: gcc-11 - cxx: g++-11 + cc: gcc-12 + cxx: g++-12 vcpkg_triplet: x64-linux - name: "Ubuntu 22.04 (Clang)" os: ubuntu-22.04 - cc: clang-14 - cxx: clang++-14 + cc: clang-15 + cxx: clang++-15 vcpkg_triplet: x64-linux - name: "macOS 13 (Clang)" @@ -129,7 +129,10 @@ jobs: libwayland-dev \ libdecor-0-dev \ libgtk-3-dev \ - libdbus-1-dev + libdbus-1-dev \ + gcc-12 \ + g++-12 \ + clang-15 - name: Set up Linux compilers if: runner.os == 'Linux' diff --git a/src/app/gui/color.h b/src/app/gui/color.h index 1abb55dd..388e5898 100644 --- a/src/app/gui/color.h +++ b/src/app/gui/color.h @@ -1,9 +1,7 @@ #ifndef YAZE_GUI_COLOR_H #define YAZE_GUI_COLOR_H -#if defined(__clang__) -#include -#endif +#include "absl/strings/str_format.h" #include #include "absl/status/status.h" @@ -25,17 +23,11 @@ inline ImVec4 ConvertColorToImVec4(const Color &color) { } inline std::string ColorToHexString(const Color &color) { -#if defined(__clang__) - return std::format( - "{:02X}{:02X}{:02X}{:02X}", static_cast(color.red * 255), - static_cast(color.green * 255), static_cast(color.blue * 255), - static_cast(color.alpha * 255)); -#else - return absl::StrFormat("%02X%02X%02X%02X", static_cast(color.red * 255), + return absl::StrFormat("%02X%02X%02X%02X", + static_cast(color.red * 255), static_cast(color.green * 255), static_cast(color.blue * 255), static_cast(color.alpha * 255)); -#endif } // A utility function to convert an SnesColor object to an ImVec4 with diff --git a/vcpkg.json b/vcpkg.json index aa5182ff..5f5e8b4c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,5 +7,5 @@ "libpng", "sdl2[core]" ], - "builtin-baseline": "2024.12.16" + "builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00" }