mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-19 17:39:26 +02:00
Compare commits
5 Commits
add_x86_64
...
Update_web
Author | SHA1 | Date | |
---|---|---|---|
7504651dad | |||
9c713ea6b5 | |||
7427f07a27 | |||
dd60bbb440 | |||
8c081be13b |
@ -17,12 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
|
|||||||
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
||||||
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
||||||
|
|
||||||
ENV ANDROID_NDK_REVISION 22b
|
ENV ANDROID_NDK_REVISION 23
|
||||||
ENV ANDROID_NDK_API 22
|
ENV ANDROID_NDK_API 23
|
||||||
|
|
||||||
RUN mkdir -p /build && \
|
RUN mkdir -p /build && \
|
||||||
cd /build && \
|
cd /build && \
|
||||||
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
||||||
./build/tools/make_standalone_toolchain.py \
|
./build/tools/make_standalone_toolchain.py \
|
||||||
--arch arm \
|
--arch arm \
|
||||||
|
@ -21,12 +21,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
|
|||||||
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
||||||
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
||||||
|
|
||||||
ENV ANDROID_NDK_REVISION 22b
|
ENV ANDROID_NDK_REVISION 23
|
||||||
ENV ANDROID_NDK_API 22
|
ENV ANDROID_NDK_API 23
|
||||||
|
|
||||||
RUN mkdir -p /build && \
|
RUN mkdir -p /build && \
|
||||||
cd /build && \
|
cd /build && \
|
||||||
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
||||||
./build/tools/make_standalone_toolchain.py \
|
./build/tools/make_standalone_toolchain.py \
|
||||||
--arch arm64 \
|
--arch arm64 \
|
||||||
|
@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
|
|||||||
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
||||||
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
||||||
|
|
||||||
ENV ANDROID_NDK_REVISION 22b
|
ENV ANDROID_NDK_REVISION 23
|
||||||
ENV ANDROID_NDK_API 22
|
ENV ANDROID_NDK_API 23
|
||||||
|
|
||||||
RUN mkdir -p /build && \
|
RUN mkdir -p /build && \
|
||||||
cd /build && \
|
cd /build && \
|
||||||
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
||||||
./build/tools/make_standalone_toolchain.py \
|
./build/tools/make_standalone_toolchain.py \
|
||||||
--arch x86 \
|
--arch x86 \
|
||||||
|
@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
|
|||||||
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
|
||||||
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
|
||||||
|
|
||||||
ENV ANDROID_NDK_REVISION 22b
|
ENV ANDROID_NDK_REVISION 23
|
||||||
ENV ANDROID_NDK_API 22
|
ENV ANDROID_NDK_API 23
|
||||||
|
|
||||||
RUN mkdir -p /build && \
|
RUN mkdir -p /build && \
|
||||||
cd /build && \
|
cd /build && \
|
||||||
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
|
unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
|
||||||
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
cd android-ndk-r${ANDROID_NDK_REVISION} && \
|
||||||
./build/tools/make_standalone_toolchain.py \
|
./build/tools/make_standalone_toolchain.py \
|
||||||
--arch x86_64 \
|
--arch x86_64 \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM emscripten/emsdk:2.0.26
|
FROM emscripten/emsdk:2.0.27
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Revert back to "/bin/sh" as default shell
|
# Revert back to "/bin/sh" as default shell
|
||||||
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
|
|||||||
|
|
||||||
#include "common.docker"
|
#include "common.docker"
|
||||||
|
|
||||||
ENV EMSCRIPTEN_VERSION 2.0.26
|
ENV EMSCRIPTEN_VERSION 2.0.27
|
||||||
|
|
||||||
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
|
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
|
||||||
ENV CC=/emsdk/upstream/emscripten/emcc \
|
ENV CC=/emsdk/upstream/emscripten/emcc \
|
||||||
|
Reference in New Issue
Block a user