Refactor Windows build steps in GitHub Actions and improve device selection logic in RayneoApi

Author: verncat

.github/workflows/release.yml

@@ -36,15 +36,17 @@ jobs:
       - name: Bootstrap vcpkg (Windows)
         if: startsWith(matrix.os, 'windows')
         run: |
+          $env:VCPKG_ROOT = "$PWD\vcpkg"
           git clone https://github.com/microsoft/vcpkg.git "$env:VCPKG_ROOT"
-          $env:VCPKG_ROOT\bootstrap-vcpkg.bat
+          & "$env:VCPKG_ROOT\bootstrap-vcpkg.bat"
+          echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $env:GITHUB_ENV
           echo "VCPKG_INSTALLED_DIR=$env:VCPKG_ROOT\installed" >> $env:GITHUB_ENV
         shell: pwsh
 
       - name: Install dependencies (Windows)
         if: startsWith(matrix.os, 'windows')
         run: |
-          $env:VCPKG_ROOT/vcpkg.exe install libusb[core]:x64-windows sdl2[sdl2main]:x64-windows sdl2-ttf:x64-windows
+          & "$env:VCPKG_ROOT\vcpkg.exe" install libusb[core]:x64-windows sdl2:x64-windows sdl2-ttf:x64-windows
         shell: pwsh
 
       - name: Install dependencies (Ubuntu)
@@ -59,34 +61,59 @@ jobs:
           brew update
           brew install libusb sdl2 sdl2_ttf
 
-      - name: Configure CMake
+      - name: Configure CMake (Windows)
+        if: startsWith(matrix.os, 'windows')
+        run: |
+          cmake -B build -DRAYNEO_BUILD_EXAMPLES=ON -DRAYNEO_BUILD_OPENVR_DRIVER=OFF -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake"
+        shell: pwsh
+
+      - name: Configure CMake (POSIX)
+        if: matrix.os != 'windows-latest'
         run: |
-          cmake -B build -DRAYNEO_BUILD_EXAMPLES=ON -DRAYNEO_BUILD_OPENVR_DRIVER=OFF ${{ startsWith(matrix.os, 'windows') && '-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake' || '' }}
+          cmake -B build -DRAYNEO_BUILD_EXAMPLES=ON -DRAYNEO_BUILD_OPENVR_DRIVER=OFF
         shell: bash
 
-      - name: Build
+      - name: Build (Windows)
+        if: startsWith(matrix.os, 'windows')
         run: |
           cmake --build build --config ${{ matrix.build_type }} --target RayNeoSDK
           cmake --build build --config ${{ matrix.build_type }} --target RayNeoExample || true
           cmake --build build --config ${{ matrix.build_type }} --target RayNeoOrientationDemo || true
+        shell: pwsh
+
+      - name: Build (POSIX)
+        if: matrix.os != 'windows-latest'
+        run: |
+          cmake --build build --target RayNeoSDK --config ${{ matrix.build_type }}
+          cmake --build build --target RayNeoExample --config ${{ matrix.build_type }} || true
+          cmake --build build --target RayNeoOrientationDemo --config ${{ matrix.build_type }} || true
         shell: bash
 
       - name: Package artifacts
         run: |
           mkdir -p package/include package/bin package/examples
-          cp -R include/rayneo package/include/
-          # Copy library
+          if [ -d include ]; then
+            cp -R include/. package/include/
+          else
+            echo "WARNING: include directory missing"
+          fi
+          # Copy library (handle multi vs single config)
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            cp build/${{ matrix.build_type }}/RayNeoSDK.dll package/bin/ || true
-            cp build/${{ matrix.build_type }}/RayNeoSDK.lib package/bin/ || true
+            cp build/${{ matrix.build_type }}/RayNeoSDK.dll package/bin/ || echo "Missing RayNeoSDK.dll"
+            cp build/${{ matrix.build_type }}/RayNeoSDK.lib package/bin/ || echo "Missing RayNeoSDK.lib"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            cp build/RayNeoSDK.dylib package/bin/ || true
+            cp build/libRayNeoSDK.dylib package/bin/ || echo "Missing libRayNeoSDK.dylib"
+          else
+            cp build/libRayNeoSDK.so package/bin/ || echo "Missing libRayNeoSDK.so"
+          fi
+          # Copy examples (Windows uses config dirs; others direct)
+          if [ "${{ matrix.os }}" = "windows-latest" ]; then
+            cp build/examples/simple/${{ matrix.build_type }}/* package/examples/ 2>/dev/null || true
+            cp build/examples/orientation_demo/${{ matrix.build_type }}/* package/examples/ 2>/dev/null || true
           else
-            cp build/libRayNeoSDK.so package/bin/ || true
+            cp build/examples/simple/* package/examples/ 2>/dev/null || true
+            cp build/examples/orientation_demo/* package/examples/ 2>/dev/null || true
           fi
-          # Copy examples if built
-          cp build/examples/simple/${{ matrix.build_type }}/* package/examples/ 2>/dev/null || true
-          cp build/examples/orientation_demo/${{ matrix.build_type }}/* package/examples/ 2>/dev/null || true
           tar -czf rayneo-sdk-${{ matrix.os }}.tar.gz package
         shell: bash
 

CMakeLists.txt

@@ -46,6 +46,7 @@ endif()
 
 # Provide a unified interface target that downstream code can link against
 add_library(LibUsb INTERFACE)
+add_library(RayNeo::LibUsb ALIAS LibUsb)
 
 if (TARGET PkgConfig::libusb)
     # pkg-config found: reuse its imported target and propagate its compile flags
@@ -90,7 +91,7 @@ if (NOT APPLE)
         endif()
     else()
         # On Linux we usually rely on system loader; attempt to find .so for optional copy.
-        get_target_property(_rayneo_libusb_lib RayNeo::LibUsb INTERFACE_LINK_LIBRARIES)
+    get_target_property(_rayneo_libusb_lib LibUsb INTERFACE_LINK_LIBRARIES)
         # _rayneo_libusb_lib may list several; attempt to locate a libusb shared object hint.
         foreach(lib IN LISTS _rayneo_libusb_lib)
             if (lib MATCHES "libusb" AND EXISTS "${lib}")
@@ -104,7 +105,10 @@ if (NOT APPLE)
     endif()
 endif()
 
-add_library(RayNeo::LibUsb ALIAS LibUsb)
+# OpenGL policy to prefer GLVND when available (silences warning)
+if (POLICY CMP0072)
+    cmake_policy(SET CMP0072 NEW)
+endif()
 
 # Platform-specific dependencies ----------------------------------------------
 if (APPLE)

src/RayneoApi.cpp

@@ -338,16 +338,17 @@ static bool macEnsureDeviceSelected(RayneoContext__ *ctx)
     if (!set)
         return false;
     CFIndex count = CFSetGetCount(set);
-    // CFSetGetValues expects an array of const void*. Casting directly from
-    // IOHIDDeviceRef* to const void** is rejected by Clang due to qualifier loss.
-    // Use an intermediate buffer of CFTypeRef (alias of const void*) then cast
-    // each element to IOHIDDeviceRef.
-    std::vector<CFTypeRef> raw(static_cast<size_t>(count));
+    // CFSetGetValues fills an array of const void* values. We store them as such
+    // then cast to IOHIDDeviceRef (opaque pointer) for inspection. Removing const
+    // is safe: we do not mutate device objects here, only read properties.
+    std::vector<const void *> raw(static_cast<size_t>(count));
     if (count > 0)
         CFSetGetValues(set, raw.data());
-    for (auto entry : raw)
+    for (const void *entry : raw)
     {
-        IOHIDDeviceRef dev = static_cast<IOHIDDeviceRef>(entry);
+        // Convert const void* from CFSet to IOHIDDeviceRef without triggering
+        // qualifier warnings: IOHIDDeviceRef is an opaque pointer typedef.
+        IOHIDDeviceRef dev = reinterpret_cast<IOHIDDeviceRef>(const_cast<void *>(entry));
         if (!dev)
             continue;
         int vid = macGetDeviceInt(dev, CFSTR(kIOHIDVendorIDKey));