mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-23 12:26:59 +01:00
Updated the build containers based on: 18b7ecfcd9
This commit is contained in:
parent
39fa5450c2
commit
9a85a52e0d
@ -2,17 +2,17 @@ ARG img_version
|
|||||||
FROM pandemonium-fedora:${img_version}
|
FROM pandemonium-fedora:${img_version}
|
||||||
|
|
||||||
ENV ANDROID_SDK_ROOT=/root/sdk
|
ENV ANDROID_SDK_ROOT=/root/sdk
|
||||||
ENV ANDROID_NDK_VERSION=21.4.7075529
|
ENV ANDROID_NDK_VERSION=23.2.8568313
|
||||||
ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}
|
ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}
|
||||||
|
|
||||||
RUN dnf -y install --setopt=install_weak_deps=False \
|
RUN dnf -y install --setopt=install_weak_deps=False \
|
||||||
gcc gcc-c++ java-11-openjdk-devel ncurses-compat-libs && \
|
gcc gcc-c++ java-11-openjdk-devel ncurses-compat-libs && \
|
||||||
mkdir -p sdk && cd sdk && \
|
mkdir -p sdk && cd sdk && \
|
||||||
export CMDLINETOOLS=commandlinetools-linux-7302050_latest.zip && \
|
export CMDLINETOOLS=commandlinetools-linux-8512546_latest.zip && \
|
||||||
curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \
|
curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \
|
||||||
unzip ${CMDLINETOOLS} && \
|
unzip ${CMDLINETOOLS} && \
|
||||||
rm ${CMDLINETOOLS} && \
|
rm ${CMDLINETOOLS} && \
|
||||||
yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \
|
yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \
|
||||||
cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;30.0.3' 'platforms;android-30' 'cmake;3.18.1'
|
cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;32.0.0' 'platforms;android-32' 'cmake;3.18.1'
|
||||||
|
|
||||||
CMD /bin/bash
|
CMD /bin/bash
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
ARG img_version
|
ARG img_version
|
||||||
FROM pandemonium-fedora:${img_version}
|
FROM pandemonium-fedora:${img_version}
|
||||||
|
|
||||||
ENV EMSCRIPTEN_CLASSICAL=2.0.25
|
ENV EMSCRIPTEN_CLASSICAL=3.1.14
|
||||||
|
|
||||||
RUN dnf -y install --setopt=install_weak_deps=False \
|
RUN dnf -y install --setopt=install_weak_deps=False \
|
||||||
java-openjdk && \
|
java-openjdk && \
|
||||||
|
@ -7,7 +7,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
|
|||||||
automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm cmake && \
|
automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm cmake && \
|
||||||
git clone --progress https://github.com/tpoechtrager/osxcross.git && \
|
git clone --progress https://github.com/tpoechtrager/osxcross.git && \
|
||||||
cd /root/osxcross && \
|
cd /root/osxcross && \
|
||||||
git checkout 0f87f567dfaf98460244471ad6c0f4311d62079c && \
|
git checkout 17bb5e2d0a46533c1dd525cf4e9a80d88bd9f00e && \
|
||||||
ln -s /root/files/MacOSX11.3.sdk.tar.xz /root/osxcross/tarballs && \
|
ln -s /root/files/MacOSX11.3.sdk.tar.xz /root/osxcross/tarballs && \
|
||||||
UNATTENDED=1 ./build.sh && \
|
UNATTENDED=1 ./build.sh && \
|
||||||
./build_compiler_rt.sh
|
./build_compiler_rt.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user