SHS/shstk
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support_gl

Browse Source
This commit is contained in:
Пелипенко Иван
2023-09-24 15:19:39 +03:00
parent 5f72c4c6e6
commit 8caaf0f259
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/linux_cross-shstk/Dockerfile
View File

@@ -4,6 +4,7 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft WORKDIR /soft
@@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& ldconfig && ldconfig
WORKDIR /soft/shstk_build 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 install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf * && rm -rf *

3
docker/linux_desktop-shstk/Dockerfile
View File

@@ -4,13 +4,14 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4 ARG JOBS_COUNT=4
ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft WORKDIR /soft
RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
WORKDIR /soft/shstk_build_linux 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} \ && cmake --build ./ --target install -j${JOBS_COUNT} \
&& ldconfig \ && ldconfig \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \