Merge pull request #5 from fbraz3/macos-build

Macos build

Author: fbraz3

.github/workflows/build-macos.yml

@@ -53,12 +53,49 @@ jobs:
           restore-keys: |
             brew-macos-${{ runner.os }}-
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: '533a5fda5c0646d1771345fb572e759283444d5f'
+
       - name: Install Dependencies
         run: |
           echo "Installing macOS build dependencies..."
-          brew install cmake ninja meson
-          cmake --version
-          ninja --version
+          
+          # Update Homebrew to ensure fresh formulas
+          brew update
+          
+          # Ensure xcode-select is properly configured (needed for clang/clang++)
+          xcode-select --install 2>/dev/null || echo "xcode-select already installed"
+          xcode-select -p || (echo "❌ Xcode command-line tools not installed"; exit 1)
+          
+          # Build tools
+          brew install cmake ninja meson pkg-config
+          
+          # FFmpeg (required by GameEngineDevice for video playback via pkg-config)
+          brew install ffmpeg
+          
+          # Freetype + Fontconfig (required by font rendering)
+          brew install freetype fontconfig
+          
+          # GLM (required by CompatLib for math, SAGE_USE_GLM)
+          brew install glm
+
+          # glslang (required by DXVK Meson build to compile GLSL shaders to SPIR-V)
+          brew install glslang
+
+          # OpenAL Soft (required by audio layer; provides <AL/al.h> — macOS system OpenAL framework uses <OpenAL/al.h> which is incompatible)
+          brew install openal-soft
+
+          # Verify all tools are available
+          cmake --version | head -1
+          ninja --version | head -1
+          meson --version | head -1
+          pkg-config --version | head -1
+          clang --version | head -1
+          pkg-config --modversion libavcodec 2>/dev/null && echo "✅ FFmpeg: libavcodec available" || echo "❌ FFmpeg: libavcodec NOT found"
+          find /opt/homebrew -name "glmConfig.cmake" 2>/dev/null | head -1 && echo "✅ GLM cmake config found" || echo "❌ GLM cmake config NOT found"
+          
           echo "✅ Build tools installed"
 
       - name: Install Vulkan SDK
@@ -101,44 +138,91 @@ jobs:
           # Extract and install if valid ZIP
           if [ -f "$VULKAN_ZIP" ] && [ "$(stat -f%z "$VULKAN_ZIP" 2>/dev/null || echo 0)" -gt 100000000 ]; then
             echo "Extracting Vulkan SDK ZIP..."
-            mkdir -p /tmp/vulkan-extract
-            unzip -q "$VULKAN_ZIP" -d /tmp/vulkan-extract
             
-            # Find the .app installer bundle
-            VULKAN_APP=$(find /tmp/vulkan-extract -name "*.app" -type d 2>/dev/null | head -1)
-            if [ -z "$VULKAN_APP" ]; then
-              echo "❌ No .app installer found in extracted ZIP"
-              ls -la /tmp/vulkan-extract/
-              VULKAN_APP=""
+            # Verify ZIP integrity before extraction
+            echo "Validating ZIP file integrity..."
+            if ! unzip -t "$VULKAN_ZIP" > /dev/null 2>&1; then
+              echo "❌ ZIP file is corrupted"
+              unzip -t "$VULKAN_ZIP" || true
+              rm -f "$VULKAN_ZIP"
+              VULKAN_SDK=""
             else
-              echo "Found installer: $VULKAN_APP"
-              INSTALLER="$VULKAN_APP/Contents/MacOS/InstallVulkan"
+              echo "✅ ZIP file is valid"
+              
+              # List ZIP contents for debugging
+              echo "ZIP contents:"
+              unzip -l "$VULKAN_ZIP" | head -20
+              
+              # Extract with verbose output (not quiet)
+              mkdir -p /tmp/vulkan-extract
+              unzip -o "$VULKAN_ZIP" -d /tmp/vulkan-extract
+              
+              # List extracted contents
+              echo "Extracted structure:"
+              find /tmp/vulkan-extract -type f -o -type d | head -30
               
-              if [ ! -f "$INSTALLER" ]; then
-                echo "❌ Installer not found at $INSTALLER"
-                ls -la "$VULKAN_APP/Contents/MacOS/"
-                VULKAN_APP=""
+              # Strategy 1: Look for .app bundle (primary)
+              VULKAN_APP=$(find /tmp/vulkan-extract -name "*.app" -type d 2>/dev/null | head -1)
+              if [ -n "$VULKAN_APP" ]; then
+                INSTALLER="$VULKAN_APP/Contents/MacOS/vulkansdk-macOS-1.4.341.1"
+                if [ -f "$INSTALLER" ]; then
+                  echo "Found .app bundle installer: $INSTALLER"
+                  VULKAN_EXECUTABLE="$INSTALLER"
+                else
+                  echo "⚠️ .app bundle found but executable not at expected path"
+                  ls -la "$VULKAN_APP/Contents/MacOS/" || true
+                  VULKAN_EXECUTABLE=""
+                fi
               else
+                echo "⚠️ No .app bundle found"
+              fi
+              
+              # Strategy 2: Look for direct executable if no .app found
+              if [ -z "$VULKAN_EXECUTABLE" ]; then
+                VULKAN_EXECUTABLE=$(find /tmp/vulkan-extract -name "vulkansdk-macOS-*" -type f -executable 2>/dev/null | head -1)
+                if [ -n "$VULKAN_EXECUTABLE" ]; then
+                  echo "Found direct executable: $VULKAN_EXECUTABLE"
+                else
+                  # Try non-executable variant
+                  VULKAN_EXECUTABLE=$(find /tmp/vulkan-extract -name "vulkansdk-macOS-*" -type f 2>/dev/null | head -1)
+                  if [ -n "$VULKAN_EXECUTABLE" ]; then
+                    echo "Found executable (making executable): $VULKAN_EXECUTABLE"
+                    chmod +x "$VULKAN_EXECUTABLE"
+                  fi
+                fi
+              fi
+              
+              # Execute installer if found
+              if [ -n "$VULKAN_EXECUTABLE" ] && [ -f "$VULKAN_EXECUTABLE" ]; then
                 INSTALL_TARGET="$HOME/VulkanSDK/1.4.341.1"
                 echo "Running Vulkan SDK installer to $INSTALL_TARGET..."
-                "$INSTALLER" \
+                "$VULKAN_EXECUTABLE" \
                   --root "$INSTALL_TARGET" \
                   --accept-licenses \
                   --default-answer \
                   --confirm-command install
-              fi
-              
-              INSTALL_STATUS=$?
-              if [ $INSTALL_STATUS -eq 0 ]; then
-                VULKAN_SDK="$INSTALL_TARGET"
-                echo "✅ Vulkan SDK installed to $VULKAN_SDK"
+                INSTALL_STATUS=$?
+                
+                if [ $INSTALL_STATUS -eq 0 ]; then
+                  # Normalize to platform subdirectory (CMake FindVulkan expects VULKAN_SDK/lib, not VULKAN_SDK/macOS/lib)
+                  if [ -d "$INSTALL_TARGET/macOS" ]; then
+                    VULKAN_SDK="$INSTALL_TARGET/macOS"
+                  else
+                    VULKAN_SDK="$INSTALL_TARGET"
+                  fi
+                  echo "✅ Vulkan SDK installed to $INSTALL_TARGET"
+                  echo "✅ Normalized VULKAN_SDK to: $VULKAN_SDK"
+                else
+                  echo "❌ Installer failed with status $INSTALL_STATUS"
+                  VULKAN_SDK=""
+                fi
               else
-                echo "❌ Installer failed with status $INSTALL_STATUS"
+                echo "❌ No installer found"
                 VULKAN_SDK=""
               fi
+              
+              rm -rf /tmp/vulkan-extract "$VULKAN_ZIP"
             fi
-            
-            rm -rf /tmp/vulkan-extract "$VULKAN_ZIP"
           else
             echo "⚠️ Vulkan SDK versioned download/validation failed; trying Homebrew fallback"
           fi
@@ -159,8 +243,17 @@ jobs:
           
           # Set environment variables for downstream steps
           if [ -z "$VULKAN_SDK" ] || [ ! -d "$VULKAN_SDK" ]; then
-            # Last resort: search for any installed SDK
-            VULKAN_SDK="$(find $HOME/VulkanSDK -maxdepth 1 -type d 2>/dev/null | head -1)"
+            # Last resort: search for any installed SDK, prefer macOS subdir
+            for candidate in $(find $HOME/VulkanSDK -maxdepth 2 -type d -name "macOS" 2>/dev/null); do
+              VULKAN_SDK="$candidate"
+              break
+            done
+          fi
+
+          # Normalize: if VULKAN_SDK points to version root (has macOS subdir), use macOS subdir
+          if [ -d "$VULKAN_SDK/macOS" ] && [ -f "$VULKAN_SDK/macOS/lib/libvulkan.dylib" ]; then
+            VULKAN_SDK="$VULKAN_SDK/macOS"
+            echo "Normalized VULKAN_SDK to platform subdirectory"
           fi
           
           if [ -z "$VULKAN_SDK" ] || [ ! -d "$VULKAN_SDK" ]; then
@@ -175,17 +268,23 @@ jobs:
           if [ -f "$VULKAN_SDK/lib/libMoltenVK.dylib" ]; then
             echo "✅ MoltenVK found at $VULKAN_SDK/lib/libMoltenVK.dylib"
           else
-            echo "⚠️ MoltenVK not found at expected location; build may still work if system Vulkan is available"
+            echo "⚠️ MoltenVK not found at $VULKAN_SDK/lib/libMoltenVK.dylib"
             echo "Checking for alternate locations..."
-            find "$VULKAN_SDK" -name "libMoltenVK*" 2>/dev/null | head -5 || echo "(none found)"
+            find "$(dirname $VULKAN_SDK)" -name "libMoltenVK*" 2>/dev/null | head -5 || echo "(none found)"
           fi
 
       - name: Configure CMake (macOS)
         env:
           VULKAN_SDK: ${{ env.VULKAN_SDK }}
+          VCPKG_ROOT: ${{ env.VCPKG_ROOT }}
+          VCPKG_DEFAULT_TRIPLET: arm64-osx
+          CC: clang
+          CXX: clang++
         run: |
           mkdir -p logs
           echo "VULKAN_SDK=$VULKAN_SDK"
+          echo "CC=$CC"
+          echo "CXX=$CXX"
           cmake --preset ${{ inputs.preset }} 2>&1 | tee logs/configure_macos.log
           CONFIG_STATUS=${PIPESTATUS[0]}
           if [ $CONFIG_STATUS -eq 0 ]; then echo "✅ CMake configuration complete"; else echo "❌ CMake configuration failed"; exit 1; fi
@@ -272,10 +371,15 @@ jobs:
             [ -f "$f" ] && cp -v "$f" "${RUNTIME_DIR}/lib/" || true
           done
           
-          # MoltenVK dylib from Vulkan SDK
-          if [ -f "${{ env.VULKAN_SDK }}/lib/libMoltenVK.dylib" ]; then
-            echo "  Copying MoltenVK..."
+          # MoltenVK dylib from Vulkan SDK (check both primary and fallback paths)
+          if [ -f "${{ env.VULKAN_SDK }}/macOS/lib/libMoltenVK.dylib" ]; then
+            echo "  Copying MoltenVK from macOS/lib..."
+            cp -v "${{ env.VULKAN_SDK }}/macOS/lib/libMoltenVK.dylib" "${RUNTIME_DIR}/lib/" || true
+          elif [ -f "${{ env.VULKAN_SDK }}/lib/libMoltenVK.dylib" ]; then
+            echo "  Copying MoltenVK from lib..."
             cp -v "${{ env.VULKAN_SDK }}/lib/libMoltenVK.dylib" "${RUNTIME_DIR}/lib/" || true
+          else
+            echo "  ⚠️ MoltenVK dylib not found in Vulkan SDK"
           fi
           
           echo "  Copying run.sh wrapper from scripts..."

cmake/dx8.cmake

@@ -81,75 +81,61 @@ elseif(APPLE AND SAGE_USE_MOLTENVK)
   set(DXVK_D3D8_LIB  "${DXVK_BUILD_DIR}/src/d3d8/libdxvk_d3d8.0.dylib")
   set(DXVK_D3D9_LIB  "${DXVK_BUILD_DIR}/src/d3d9/libdxvk_d3d9.0.dylib")
 
-  # Detect Vulkan SDK location for Meson configuration
-  # GeneralsX @build BenderAI 03/03/2026: Handle cases where VULKAN_SDK is not installed
+  # Detect Vulkan SDK location for Meson configuration.
+  # VULKAN_SDK must point to the platform subdir (e.g. ~/VulkanSDK/1.4.x/macOS)
+  # where lib/libvulkan.dylib and lib/libMoltenVK.dylib live.
+  # GeneralsX @build BenderAI 03/03/2026: Normalize env path to macOS platform subdir
   set(VULKAN_SDK_ENV "$ENV{VULKAN_SDK}")
-  if(NOT VULKAN_SDK_ENV)
-    # Try home directory for manually installed SDK (installer puts it in $HOME/VulkanSDK/VERSION/)
-    file(GLOB VULKAN_HOME_DIRS "$ENV{HOME}/VulkanSDK/*")
+
+  # If VULKAN_SDK points to the version root (has macOS/ subdir), normalize it
+  if(VULKAN_SDK_ENV AND EXISTS "${VULKAN_SDK_ENV}/macOS/lib/libMoltenVK.dylib")
+    set(VULKAN_SDK_ENV "${VULKAN_SDK_ENV}/macOS")
+    message(STATUS "DXVK macOS build: Normalized VULKAN_SDK to platform subdir: ${VULKAN_SDK_ENV}")
+  endif()
+
+  if(NOT VULKAN_SDK_ENV OR NOT EXISTS "${VULKAN_SDK_ENV}/lib/libMoltenVK.dylib")
+    # Try home directory: look for ~/VulkanSDK/*/macOS
+    file(GLOB VULKAN_HOME_DIRS "$ENV{HOME}/VulkanSDK/*/macOS")
     if(VULKAN_HOME_DIRS)
-      # Find the latest version directory
       list(SORT VULKAN_HOME_DIRS)
       list(REVERSE VULKAN_HOME_DIRS)
       list(GET VULKAN_HOME_DIRS 0 POTENTIAL_SDK)
       if(EXISTS "${POTENTIAL_SDK}/lib/libMoltenVK.dylib")
         set(VULKAN_SDK_ENV "${POTENTIAL_SDK}")
       endif()
     endif()
-    
-    # Try common Homebrew locations if home directory search failed
-    if(NOT VULKAN_SDK_ENV)
-      if(EXISTS "/usr/local/Caskroom/vulkan-sdk")
-        set(VULKAN_SDK_ENV "/usr/local/Caskroom/vulkan-sdk/latest/VulkanSDK")
-      elseif(EXISTS "/opt/homebrew/Caskroom/vulkan-sdk")
-        set(VULKAN_SDK_ENV "/opt/homebrew/Caskroom/vulkan-sdk/latest/VulkanSDK")
+  endif()
+
+  if(NOT VULKAN_SDK_ENV OR NOT EXISTS "${VULKAN_SDK_ENV}/lib/libMoltenVK.dylib")
+    # Try common Homebrew locations
+    foreach(BREW_PATH "/usr/local/Caskroom/vulkan-sdk/latest/VulkanSDK/macOS" "/opt/homebrew/Caskroom/vulkan-sdk/latest/VulkanSDK/macOS")
+      if(EXISTS "${BREW_PATH}/lib/libMoltenVK.dylib")
+        set(VULKAN_SDK_ENV "${BREW_PATH}")
+        break()
       endif()
-    endif()
+    endforeach()
   endif()
 
   if(VULKAN_SDK_ENV AND EXISTS "${VULKAN_SDK_ENV}/lib/libMoltenVK.dylib")
     message(STATUS "DXVK macOS build: Using Vulkan SDK at ${VULKAN_SDK_ENV}")
     set(VULKAN_SDK_ENV_VAR "VULKAN_SDK=${VULKAN_SDK_ENV}")
   else()
-    message(WARNING "DXVK macOS build: Vulkan SDK not found; Meson will search in system paths")
+    message(WARNING "DXVK macOS build: Vulkan SDK / MoltenVK not found; Meson will search system paths")
+    if(VULKAN_SDK_ENV)
+      message(STATUS "  VULKAN_SDK checked: ${VULKAN_SDK_ENV}")
+    endif()
     set(VULKAN_SDK_ENV_VAR "")
   endif()
 
   ExternalProject_Add(dxvk_macos_build
     GIT_REPOSITORY    https://github.com/doitsujin/dxvk.git
-    GIT_TAG           ad253b8a7e20b7cf16fce7d1c505928a434eac29  # v2.6 pinned commit SHA
+    GIT_TAG           ad253b8a7e20b7cf16fce7d1c505928a434eac29
     SOURCE_DIR        ${DXVK_SOURCE_DIR}
     BINARY_DIR        ${DXVK_BUILD_DIR}
-    # Apply macOS patches before configuring
-    PATCH_COMMAND
-      ${CMAKE_COMMAND} -E echo "Applying macOS patches to DXVK..." &&
-      ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/dxvk-macos-patches.py ${DXVK_SOURCE_DIR}
-    # Configure with Meson using SDL3 windowing system.
-    # Force arm64 compilation despite Rosetta2 emulation:
-    # 1. Pass -mcpu=apple-m1 -arch arm64 to Clang
-    # 2. Use --native-file to tell Meson the build machine is aarch64
-    # 3. Pass VULKAN_SDK to Meson if detected
-    CONFIGURE_COMMAND
-      ${CMAKE_COMMAND} -E env
-        CC=clang CXX=clang++
-        "CFLAGS=-arch ${DXVK_HOST_ARCH} -mcpu=apple-m1"
-        "CXXFLAGS=-arch ${DXVK_HOST_ARCH} -mcpu=apple-m1"
-        "LDFLAGS=-arch ${DXVK_HOST_ARCH}"
-        ${VULKAN_SDK_ENV_VAR}
-      ${MESON_EXECUTABLE} setup ${DXVK_BUILD_DIR} ${DXVK_SOURCE_DIR}
-        --native-file ${CMAKE_SOURCE_DIR}/cmake/meson-arm64-native.ini
-        -Ddxvk_native_wsi=sdl3
-        --buildtype=release
-        --reconfigure
-    # Build d3d9 first (d3d8 links against it at runtime via @rpath),
-    # then d3d8. Both dylibs must be present in the runtime directory.
-    BUILD_COMMAND
-      ${NINJA_EXECUTABLE} -C ${DXVK_BUILD_DIR}
-        src/d3d9/libdxvk_d3d9.0.dylib
-        src/d3d8/libdxvk_d3d8.0.dylib
-    # DXVK install is not needed; we deploy the dylibs manually
+    PATCH_COMMAND     /bin/bash -lc "${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/dxvk-macos-patches.py ${DXVK_SOURCE_DIR}"
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=clang CXX=clang++ "CFLAGS=-arch ${DXVK_HOST_ARCH} -mcpu=apple-m1" "CXXFLAGS=-arch ${DXVK_HOST_ARCH} -mcpu=apple-m1" "LDFLAGS=-arch ${DXVK_HOST_ARCH}" ${VULKAN_SDK_ENV_VAR} ${MESON_EXECUTABLE} setup ${DXVK_BUILD_DIR} ${DXVK_SOURCE_DIR} --native-file ${CMAKE_SOURCE_DIR}/cmake/meson-arm64-native.ini -Ddxvk_native_wsi=sdl3 --buildtype=release --reconfigure
+    BUILD_COMMAND     ${NINJA_EXECUTABLE} -C ${DXVK_BUILD_DIR} src/d3d9/libdxvk_d3d9.0.dylib src/d3d8/libdxvk_d3d8.0.dylib
     INSTALL_COMMAND   ""
-    # Only re-patch/reconfigure when the git tag changes
     UPDATE_DISCONNECTED TRUE
   )
 

docs/DEV_BLOG/2026-02-DIARY.md

@@ -2,6 +2,23 @@
 
 ---
 
+## 2026-02-28 (SESSION 77): macOS CI — vcpkg restored to fix gli dependency
+
+**Objective**: Fix CI failure on `gli CONFIG REQUIRED` — `gli` is not on Homebrew and was previously provided by vcpkg.
+
+**Root Cause**: In session 72, `macos-vulkan` preset was changed from `inherits: "default-vcpkg"` to `inherits: "default"` to remove the broken `$env{VCPKG_ROOT}` reference (VCPKG_ROOT was unset in CI). This removed the vcpkg toolchain file entirely, which broke resolution of `gli`, `glm`, `freetype`, `fontconfig` — all defined in `vcpkg.json`. Locally they still worked because `VCPKG_ROOT=/Users/felipebraz/vcpkg` was already set in the shell env.
+
+**Fix Applied**:
+1. **`CMakePresets.json`**: Restored `macos-vulkan` to `inherits: "default-vcpkg"` (reverts session 72 change).
+2. **`build-macos.yml`**: Added `lukka/run-vcpkg@v11` step after brew cache, bootstrapping vcpkg at baseline commit `533a5fda5` (matches `vcpkg.json` builtin-baseline).
+3. **`build-macos.yml`**: Configure CMake step now exports `VCPKG_ROOT` and `VCPKG_DEFAULT_TRIPLET=arm64-osx` so CMake preset resolves the toolchain file correctly.
+
+**Key Insight**: The project already had a `vcpkg.json` manifest with `gli`, `glm`, `zlib`, `freetype`, `fontconfig`. The correct fix was never to remove vcpkg — it was to provide `VCPKG_ROOT` to the CI environment. The `lukka/run-vcpkg` action handles this cleanly with built-in caching.
+
+**State**: Commit `87dce18a5` pushed to `macos-build`. CI run triggered.
+
+---
+
 ## 2026-02-27 (SESSION 68.6): GitHub Actions — macOS Workflow Audit & Improvements
 
 **Objective**: Apply lessons learned from Linux workflow to harden macOS workflow before merging to `main`.