diff options
| author |  Paul Buxton <paulbuxton.mail@googlemail.com> | 2019-09-07 10:51:20 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-13 11:31:38 -0700 |
| commit | 60e63afb8219ca22001a4d1c5c0e6a7e27af89d5 (patch) | |
| tree | 337422172e8ac5975b65c35b34dac3ffa2de907b /scripts/docker | |
| parent | 9c744e401edb1d2fc31c77b4b156f47be06ce367 (diff) | |
| download | subsurface-60e63afb8219ca22001a4d1c5c0e6a7e27af89d5.tar.gz | |
Windows build: Changesto build using mxebased hidapi,libusb and grantlee
Remove hidapi from manually built components and use the mxe based one instead.
Remove libzip as that is handled by mxe packages.
Update version of grantlee used to build with qt 5.13.1.
Also hide vscode files from git.
[Dirk Hohndel: combined two commits, cleaned up the commit message and removed
one now incorrect comment line from mxe-based-build.sh]
Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker')
| -rw-r--r-- | scripts/docker/mxe-build-container/settings.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index aadfc4c6f..638e18f4a 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 +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 .DEFAULT local-pkg-list: local-pkg-list: $(LOCAL_PKG_LIST) |