From 852f59d0e6764a57e1f5a565e59bf627b95ef060 Mon Sep 17 00:00:00 2001 From: Mary Date: Sun, 30 May 2021 17:23:58 +0200 Subject: [PATCH] Workaround SDL2 usb lib soname search returning emtpy string Should finally make HIDAPI work on linux... --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3801a3c..18d8dfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,14 +16,14 @@ jobs: fail-fast: false matrix: platform: - - { name: win-x64, os: windows-latest, flags: -A x64 -DHAVE_DINPUT_H=0 } - - { name: win-x86, os: windows-latest, flags: -A Win32 -DHAVE_DINPUT_H=0 } - - { name: win-arm64, os: windows-latest, flags: -A ARM64 -DHAVE_DINPUT_H=0 } - - { name: linux-x64, os: ubuntu-18.04, flags: -GNinja -DHIDAPI=ON, target_apt_arch: ":amd64" } - - { name: linux-x86, os: ubuntu-18.04, flags: -GNinja -DHIDAPI=ON, cmake_configure_env: CFLAGS=-m32 CXXFLAGS=-m32, target_apt_arch: ":i386" } - - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" } + - { name: win-x64, os: windows-latest, flags: -A x64 -DHAVE_DINPUT_H=0 } + - { name: win-x86, os: windows-latest, flags: -A Win32 -DHAVE_DINPUT_H=0 } + - { name: win-arm64, os: windows-latest, flags: -A ARM64 -DHAVE_DINPUT_H=0 } + - { name: linux-x64, os: ubuntu-18.04, flags: -GNinja -DHIDAPI=ON -DUSB_LIB_SONAME="libusb-1.0.so.0", target_apt_arch: ":amd64" } + - { name: linux-x86, os: ubuntu-18.04, flags: -GNinja -DHIDAPI=ON -DUSB_LIB_SONAME="libusb-1.0.so.0", cmake_configure_env: CFLAGS=-m32 CXXFLAGS=-m32, target_apt_arch: ":i386" } + - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" } # NOTE: macOS 11.0 is the first released supported by Apple Silicon. - - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" } + - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" } steps: - name: Setup Linux dependencies if: runner.os == 'Linux'