From 744c688003b09cdf48fedd330c99f4e603a71679 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 23 Apr 2021 00:35:05 +0300 Subject: [PATCH] qad HAS_GL option, by default disabled for linux dockers --- 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 15e193e..707587a 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=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=0 -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 128a248..89fca29 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 -DQGLVIEW=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 -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 d894a66..a7a4f07 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=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/qad b/qad index 36a567d..c246ed9 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 36a567dbeb4be5795a1766f75ee080521d231f8e +Subproject commit c246ed9b50737fc96a1360ce579bdbae25d3580b