aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/windows-container
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-14 07:31:05 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-14 07:31:56 -0700
commitcd8e1eb15aa23e760a2e7a952652e92433f43a6c (patch)
tree9d23eb82b9b089477459742254bfe195108d626f /scripts/windows-container
parent5f11c94f02eca651e07f5a0c2cc4e55dcbf2df0b (diff)
downloadsubsurface-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/windows-container')
-rw-r--r--scripts/windows-container/before_install.sh5
1 files changed, 5 insertions, 0 deletions
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