From 9c215fe5201707164dde89e3e5056d9cd9b3d62e Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 23 Apr 2021 10:16:47 +0300 Subject: [PATCH] revert QGLENGINE and QGLVIEW flags --- docker/debian-shstk/Dockerfile | 2 +- docker/pi-shstk/Dockerfile | 2 +- docker/ubuntu-shstk/Dockerfile | 2 +- qad | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/debian-shstk/Dockerfile b/docker/debian-shstk/Dockerfile index 707587a..05586d7 100644 --- a/docker/debian-shstk/Dockerfile +++ b/docker/debian-shstk/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /soft RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_debian -RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 89fca29..1e80fdf 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -15,7 +15,7 @@ RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && ldconfig WORKDIR /soft/shstk_build_pi -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * WORKDIR /soft/src diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile index a7a4f07..c2af254 100644 --- a/docker/ubuntu-shstk/Dockerfile +++ b/docker/ubuntu-shstk/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /soft RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_ubuntu -RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/qad b/qad index c246ed9..4880d36 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit c246ed9b50737fc96a1360ce579bdbae25d3580b +Subproject commit 4880d3604f75075142c1bf7ae31fa959c42b89d4