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 | |
| 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')
| -rw-r--r-- | scripts/docker/mxe-build-container/settings.mk | 2 | ||||
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 | ||||
| -rw-r--r-- | scripts/windows-container/before_install.sh | 5 |
3 files changed, 2 insertions, 7 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) diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 830a3349e..ef1d2beda 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -15,7 +15,7 @@ CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="1.3" CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9" CURRENT_BREEZE_ICONS="" -CURRENT_GRANTLEE="v5.0.0" +CURRENT_GRANTLEE="master" CURRENT_MDBTOOLS="master" CURRENT_QT_ANDROID_CMAKE="master" diff --git a/scripts/windows-container/before_install.sh b/scripts/windows-container/before_install.sh index f6b898c6d..17012ae2f 100644 --- a/scripts/windows-container/before_install.sh +++ b/scripts/windows-container/before_install.sh @@ -23,9 +23,7 @@ autoreconf --install # the intended layout as seen inside the container is # /win/subsurface # sources that we are testing # /win32 # binaries that are build -# /grantlee # /libzip -# /hidapi # /googlemaps # # the first two are mounted as volumes (this way we get access to the @@ -43,10 +41,7 @@ docker exec -t builder apt-get install -y ca-certificates libtool # now set up our other dependencies # these are either not available in MXE, or a version that's too old -docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . libzip -docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . hidapi docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . googlemaps -docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . grantlee # smtk2ssrf build docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . mdbtools |