diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 07:31:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 07:31:56 -0700 |
| commit | cd8e1eb15aa23e760a2e7a952652e92433f43a6c (patch) | |
| tree | 9d23eb82b9b089477459742254bfe195108d626f /scripts | |
| parent | 5f11c94f02eca651e07f5a0c2cc4e55dcbf2df0b (diff) | |
| download | subsurface-cd8e1eb15aa23e760a2e7a952652e92433f43a6c.tar.gz | |
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 <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, 7 insertions, 2 deletions
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) diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 0ae39880c..d12397537 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="v5.62.0" CURRENT_BREEZE_ICONS="" -CURRENT_GRANTLEE="master" +CURRENT_GRANTLEE="v5.0.0" 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 17012ae2f..f6b898c6d 100644 --- a/scripts/windows-container/before_install.sh +++ b/scripts/windows-container/before_install.sh @@ -23,7 +23,9 @@ 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 @@ -41,7 +43,10 @@ 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 |