From e1cc58bcdb97664cb2c4657ec53430305f5f5b34 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 01:35:00 -0400 Subject: [PATCH] Remove Abseil dependency from vcpkg.json and clear overrides section to simplify project configuration. --- .github/workflows/release.yml | 6 +++--- cmake/sdl2.cmake | 4 +++- vcpkg.json | 11 +---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4cae003..c6a0942b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -171,7 +171,7 @@ jobs: # Install Homebrew dependencies needed for UI tests and full builds brew install pkg-config libpng boost abseil ninja gtk+3 - # Set up vcpkg for Windows builds + # Set up vcpkg for Windows builds (Abseil removed from vcpkg.json to avoid MSYS2 issues) - name: Set up vcpkg (Windows) if: runner.os == 'Windows' uses: lukka/run-vcpkg@v11 @@ -209,15 +209,15 @@ jobs: shell: pwsh run: | Write-Host "Configuring CMake for Windows build..." + Write-Host "Note: Using source-built Abseil, vcpkg for other dependencies" - # Use vcpkg toolchain + # Use vcpkg toolchain (Abseil will be built from source via cmake/absl.cmake) cmake -B build ` -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} ` -DCMAKE_POLICY_VERSION_MINIMUM=3.16 ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" ` -DYAZE_BUILD_TESTS=OFF ` -DYAZE_BUILD_EMU=OFF ` - -DYAZE_BUILD_Z3ED=OFF ` -DYAZE_ENABLE_ROM_TESTS=OFF ` -DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF ` -DYAZE_INSTALL_LIB=OFF ` diff --git a/cmake/sdl2.cmake b/cmake/sdl2.cmake index aeb1a79c..c8f8dd1b 100644 --- a/cmake/sdl2.cmake +++ b/cmake/sdl2.cmake @@ -22,14 +22,16 @@ endif() # libpng and ZLIB dependencies if(WIN32) - # Windows builds with vcpkg + # Windows builds with vcpkg (Abseil removed to avoid MSYS2 issues) if(NOT YAZE_MINIMAL_BUILD) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) + find_package(GLEW REQUIRED) else() # For CI/minimal builds, try to find but don't require find_package(ZLIB QUIET) find_package(PNG QUIET) + find_package(GLEW QUIET) if(NOT ZLIB_FOUND OR NOT PNG_FOUND) message(STATUS "PNG/ZLIB not found in minimal build, some features may be disabled") set(PNG_FOUND FALSE) diff --git a/vcpkg.json b/vcpkg.json index bbfe3b68..4dc8c175 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -16,22 +16,13 @@ "platform": "!uwp", "features": ["vulkan"] }, - { - "name": "abseil", - "platform": "!uwp" - }, { "name": "glew", "platform": "!uwp" } ], "builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00", - "overrides": [ - { - "name": "abseil", - "version": "20220623.1" - } - ], + "overrides": [], "features": { "pkg-config": { "description": "Use pkg-config for dependency detection",