Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from thewtex/emscripten-force-compiler

Browse Source 
Emscripten force compiler
This commit is contained in:
Matt McCormick 2016-08-11 18:20:25 -04:00 committed by GitHub
commit a3e0d34ac0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -46,7 +46,7 @@ COPY imagefiles/.bashrc /root/
WORKDIR /usr/src WORKDIR /usr/src
RUN git clone git://cmake.org/cmake.git CMake && \ RUN git clone git://cmake.org/cmake.git CMake && \
cd CMake && \ cd CMake && \
git checkout v3.6.0 && \ git checkout v3.6.1 && \
cd .. && mkdir CMake-build && cd CMake-build && \ cd .. && mkdir CMake-build && cd CMake-build && \
/usr/src/CMake/bootstrap \ /usr/src/CMake/bootstrap \
--parallel=$(nproc) \ --parallel=$(nproc) \

8
browser-asmjs/Dockerfile
View File

@ -8,7 +8,7 @@ RUN curl -sL https://deb.nodesource.com/setup_4.x | bash - && \
nodejs \ nodejs \
python2.7 python2.7
ENV EMSCRIPTEN_VERSION 1.36.5 ENV EMSCRIPTEN_VERSION 1.36.7
RUN cd /usr && \ RUN cd /usr && \
curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | tar xz && \ curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | tar xz && \
cd ./emsdk_portable && \ cd ./emsdk_portable && \
@ -43,3 +43,9 @@ RUN cd /tmp && \
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs
ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake
# CMakeForceCompiler was marked deprecated in CMake 3.6.0. It emits many
# warnings when using Emscripten. These changes can be removed in a future
# version of Emscripten when it is disabled or removed per:
# https://github.com/kripken/emscripten/pull/4477
RUN sed -i -e '/CMakeForceCompiler/d' -e '/CMAKE_FORCE_C/d' $CMAKE_TOOLCHAIN_FILE