From 0eb10dea7c6e0b0971e70e24c82346aa766ee55d Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Wed, 25 Nov 2020 21:17:40 -0500
Subject: [PATCH] Switch To 32-Bit Docker Image

---
 .gitignore              | 6 +-----
 Dockerfile.client       | 8 ++------
 build/build-libpng12.sh | 3 ++-
 build/build-mods.sh     | 2 +-
 cmake/toolchain.cmake   | 5 -----
 5 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 cmake/toolchain.cmake

diff --git a/.gitignore b/.gitignore
index e94549fa9..ac82e380d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-/minecraft-pi
-/libpng
-/core/build
-/mods/build
 /out
-/debian/tmp
+/debian/tmp
\ No newline at end of file
diff --git a/Dockerfile.client b/Dockerfile.client
index 9d1acca9c..c9c5f8dac 100644
--- a/Dockerfile.client
+++ b/Dockerfile.client
@@ -1,13 +1,9 @@
-FROM arm64v8/debian:bullseye
-
-# Add ARM 32Bit
-RUN dpkg --add-architecture armhf
+FROM arm32v7/debian:bullseye
 
 # Install Dependencies
 RUN \
     apt-get update && \
-    apt-get dist-upgrade -y && \
-    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
+    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
 
 # Setup GLES Location
 RUN ln -s /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2 /usr/lib/libGLESv2.so
diff --git a/build/build-libpng12.sh b/build/build-libpng12.sh
index 755999910..b6b665efc 100755
--- a/build/build-libpng12.sh
+++ b/build/build-libpng12.sh
@@ -6,10 +6,11 @@ git clone --depth 1 https://git.code.sf.net/p/libpng/code libpng -b libpng12
 
 cd libpng
 
-./configure --host arm-linux-gnueabihf --prefix /usr/arm-linux-gnueabihf
+./configure --prefix /usr
 
 make -j$(nproc)
 make install
 
 cd ../
+
 rm -rf libpng
diff --git a/build/build-mods.sh b/build/build-mods.sh
index 5c17b8a04..cb89857d3 100755
--- a/build/build-mods.sh
+++ b/build/build-mods.sh
@@ -7,7 +7,7 @@ cd mods
 mkdir build
 cd build
 
-cmake -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain.cmake ..
+cmake ..
 make -j$(nproc)
 
 cd ../../
diff --git a/cmake/toolchain.cmake b/cmake/toolchain.cmake
deleted file mode 100644
index db2566cb5..000000000
--- a/cmake/toolchain.cmake
+++ /dev/null
@@ -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++)