Update vcpkg baseline and CI configuration for improved compatibility

- Changed the builtin baseline in vcpkg.json to a specific commit hash for better dependency management.
- Updated CI workflow in ci.yml to use GCC-12 and Clang-15, enhancing compiler support and ensuring compatibility with the latest features.
- Added necessary packages for the new compiler versions to the CI setup, improving build reliability.
This commit is contained in:
scawful
2025-09-25 10:36:09 -04:00
parent 189587d51e
commit fd49fb8511
3 changed files with 13 additions and 18 deletions

View File

@@ -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'

View File

@@ -1,9 +1,7 @@
#ifndef YAZE_GUI_COLOR_H
#define YAZE_GUI_COLOR_H
#if defined(__clang__)
#include <format>
#endif
#include "absl/strings/str_format.h"
#include <string>
#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<int>(color.red * 255),
static_cast<int>(color.green * 255), static_cast<int>(color.blue * 255),
static_cast<int>(color.alpha * 255));
#else
return absl::StrFormat("%02X%02X%02X%02X", static_cast<int>(color.red * 255),
return absl::StrFormat("%02X%02X%02X%02X",
static_cast<int>(color.red * 255),
static_cast<int>(color.green * 255),
static_cast<int>(color.blue * 255),
static_cast<int>(color.alpha * 255));
#endif
}
// A utility function to convert an SnesColor object to an ImVec4 with

View File

@@ -7,5 +7,5 @@
"libpng",
"sdl2[core]"
],
"builtin-baseline": "2024.12.16"
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00"
}