# HG changeset patch # User Sebastien Jodogne # Date 1593102782 -7200 # Node ID f12b568394961b6ae5fd2b3978d3cd81cc6917ad # Parent d450653b46d3f8d094ee7ec8ca05cf68fb6a2f43 fix docker builds diff -r d450653b46d3 -r f12b56839496 StoneWebViewer/Plugin/docker-build.sh --- a/StoneWebViewer/Plugin/docker-build.sh Thu Jun 25 17:50:36 2020 +0200 +++ b/StoneWebViewer/Plugin/docker-build.sh Thu Jun 25 18:33:02 2020 +0200 @@ -25,4 +25,4 @@ -v ${ROOT_DIR}/wasm-binaries:/target:rw ${IMAGE} \ bash /source/StoneWebViewer/Plugin/docker-internal.sh $1 -ls -lR ${ROOT_DIR}/wasm-binaries/StoneWebViewer/ +ls -lR ${ROOT_DIR}/wasm-binaries/share/ diff -r d450653b46d3 -r f12b56839496 StoneWebViewer/Plugin/docker-internal.sh --- a/StoneWebViewer/Plugin/docker-internal.sh Thu Jun 25 17:50:36 2020 +0200 +++ b/StoneWebViewer/Plugin/docker-internal.sh Thu Jun 25 18:33:02 2020 +0200 @@ -14,12 +14,14 @@ mkdir /tmp/build cd /tmp/build -cmake /tmp/source-writeable/StoneWebViewer/Plugin \ +LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake /tmp/source-writeable/StoneWebViewer/Plugin \ -DCMAKE_BUILD_TYPE=$1 \ -DCMAKE_INSTALL_PREFIX=/target/ \ -DCMAKE_TOOLCHAIN_FILE=/tmp/orthanc/Resources/LinuxStandardBaseToolchain.cmake \ -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc \ -DSTATIC_BUILD=ON \ + -DSTONE_BINARIES=/target/StoneWebViewer/ \ + -DUSE_LEGACY_JSONCPP=ON \ -G Ninja ninja -j2 install