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/windows-container/before_install.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts/windows-container/before_install.sh') 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 -- cgit v1.2.3-70-g09d2