From cd8e1eb15aa23e760a2e7a952652e92433f43a6c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 14 Oct 2019 07:31:05 -0700 Subject: Revert "Windows build: Changesto build using mxebased hidapi,libusb and grantlee" This reverts commit 60e63afb8219ca22001a4d1c5c0e6a7e27af89d5. I merged this to early without paying attention to the fact that this needed an updated build container as well. Signed-off-by: Dirk Hohndel --- scripts/docker/mxe-build-container/settings.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/docker/mxe-build-container') diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index 638e18f4a..aadfc4c6f 100644 --- a/scripts/docker/mxe-build-container/settings.mk +++ b/scripts/docker/mxe-build-container/settings.mk @@ -9,7 +9,7 @@ JOBS := 6 MXE_TARGETS := i686-w64-mingw32.shared # The three lines below makes `make` build these "local packages" instead of all packages. -LOCAL_PKG_LIST := qtbase qtconnectivity qtdeclarative qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsvg qttools qttranslations qtwebview qtwebkit libxml2 libxslt libusb1 libgit2 nsis curl libzip libftdi1 hidapi grantlee +LOCAL_PKG_LIST := qtbase qtconnectivity qtdeclarative qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsvg qttools qttranslations qtwebview qtwebkit libxml2 libxslt libusb1 libgit2 nsis curl libzip libftdi1 .DEFAULT local-pkg-list: local-pkg-list: $(LOCAL_PKG_LIST) -- cgit v1.2.3-70-g09d2