diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 3bf0e1a..a3df0be 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -4,6 +4,7 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft @@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index f79a981..d6e5acb 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -4,13 +4,14 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \