Switch To 32-Bit Docker Image

This commit is contained in:
TheBrokenRail 2020-11-25 21:17:40 -05:00
parent 02eaf4e9ef
commit 0eb10dea7c
5 changed files with 6 additions and 18 deletions

4
.gitignore vendored
View File

@ -1,6 +1,2 @@
/minecraft-pi
/libpng
/core/build
/mods/build
/out /out
/debian/tmp /debian/tmp

View File

@ -1,13 +1,9 @@
FROM arm64v8/debian:bullseye FROM arm32v7/debian:bullseye
# Add ARM 32Bit
RUN dpkg --add-architecture armhf
# Install Dependencies # Install Dependencies
RUN \ RUN \
apt-get update && \ apt-get update && \
apt-get dist-upgrade -y && \ apt-get install -y libglvnd-dev libsdl1.2-dev libx11-dev build-essential cmake zlib1g-dev git curl libfreeimage-dev libglfw3-dev xinput libxfixes-dev
apt-get install -y libglvnd-dev:armhf libsdl1.2-dev:armhf libx11-dev:armhf build-essential zlib1g-dev:armhf git cmake curl gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libfreeimage-dev:armhf libglfw3-dev:armhf xinput:armhf libxfixes-dev:armhf
# Setup GLES Location # Setup GLES Location
RUN ln -s /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 /usr/lib/libGLESv2.so RUN ln -s /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 /usr/lib/libGLESv2.so

View File

@ -6,10 +6,11 @@ git clone --depth 1 https://git.code.sf.net/p/libpng/code libpng -b libpng12
cd libpng cd libpng
./configure --host arm-linux-gnueabihf --prefix /usr/arm-linux-gnueabihf ./configure --prefix /usr
make -j$(nproc) make -j$(nproc)
make install make install
cd ../ cd ../
rm -rf libpng rm -rf libpng

View File

@ -7,7 +7,7 @@ cd mods
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain.cmake .. cmake ..
make -j$(nproc) make -j$(nproc)
cd ../../ cd ../../

View File

@ -1,5 +0,0 @@
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR arm)
set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)