From a962d4710399396fa3ff8c50cb73a040e6afe8cb Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Fri, 25 Jun 2021 10:47:58 -0500 Subject: [PATCH] trivial: fix win32 build (Fixes: #3418) Use the gusb that we build rather than the system one. --- .circleci/config.yml | 2 +- contrib/setup-win32.nsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfe99b6ac..87d4b167f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: mingw64-pkg-config mingw64-glib2 mingw64-gnutls - mingw64-libgusb + mingw64-libusbx mingw64-sqlite mingw64-libarchive mingw64-json-glib diff --git a/contrib/setup-win32.nsi b/contrib/setup-win32.nsi index ac2680ac6..e2eda1835 100644 --- a/contrib/setup-win32.nsi +++ b/contrib/setup-win32.nsi @@ -43,7 +43,6 @@ Section "fwupd" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgnutls-30.dll" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgnutls-30.dll" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgobject-2.0-0.dll" - File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgusb-2.dll" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libhogweed-5.dll" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libidn2-0.dll" File "/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libintl-8.dll" @@ -69,6 +68,7 @@ Section "fwupd" File "libgcab-1.0-0.dll" File "libxmlb-2.dll" File "libjcat-1.dll" + File "libgusb-2.dll" SetOutPath "$INSTDIR\fwupd-plugins-3" File /r "fwupd-plugins-3/libfu_plugin_*.dll" SetOutPath "$INSTDIR\etc\fwupd"