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

Merge pull request 'qad HAS_GL option, by default disabled for linux dockers' (#73) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/73
This commit was merged in pull request #73.
This commit is contained in:
Пелипенко Иван
2021-04-23 00:35:36 +03:00
parent 4c3f8b5614 744c688003
commit 2d1d22f6b8
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/debian-shstk/Dockerfile
View File

@@ -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

2
docker/pi-shstk/Dockerfile
View File

@@ -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

2
docker/ubuntu-shstk/Dockerfile
View File

@@ -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

2
qad

Submodule qad updated: 36a567dbeb...c246ed9b50