dimaguy/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Pull Requests Activity

Comment Dockerfile

Browse Source
This commit is contained in:
TheBrokenRail 2020-11-11 10:22:14 -05:00
parent c0b5026221
commit 7e8a74d1b2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.client
View File

@ -1,24 +1,32 @@
FROM arm64v8/debian:bullseye FROM arm64v8/debian:bullseye
# Add ARM 32Bit
RUN dpkg --add-architecture armhf RUN dpkg --add-architecture armhf
# Install Dependencies
RUN \ RUN \
apt-get update && \ apt-get update && \
apt-get dist-upgrade -y && \ 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: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
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
# Add Build Scripts
ADD ./build /app/build ADD ./build /app/build
WORKDIR /app WORKDIR /app
# Download MCPI
RUN ./build/download-minecraft-pi.sh RUN ./build/download-minecraft-pi.sh
# Build LibPNG12
RUN ./build/build-libpng12.sh RUN ./build/build-libpng12.sh
# Add Code
ADD . /app ADD . /app
# Build Mods
RUN ./build/build-mods.sh RUN ./build/build-mods.sh
WORKDIR ./minecraft-pi WORKDIR ./minecraft-pi

2
mods/src/compat.c
View File

@ -471,4 +471,4 @@ __attribute__((constructor)) static void init() {
is_server = mode == 2; is_server = mode == 2;
// Video is Handled By GLFW Not SDL // Video is Handled By GLFW Not SDL
setenv("SDL_VIDEODRIVER", "dummy", 1); setenv("SDL_VIDEODRIVER", "dummy", 1);
} }

2
mods/src/time.c
View File

@ -4,7 +4,7 @@
// Replace gettimeofday() With clock_gettime() // Replace gettimeofday() With clock_gettime()
int gettimeofday(struct timeval *tv, __attribute__((unused)) void *tz) { int gettimeofday(struct timeval *tv, __attribute__((unused)) void *tz) {
struct timespec tp; struct timespec tp;
int ret = clock_gettime(CLOCK_MONOTONIC, &tp); int ret = clock_gettime(CLOCK_MONOTONIC_COARSE, &tp);
tv->tv_sec = tp.tv_sec; tv->tv_sec = tp.tv_sec;
tv->tv_usec = tp.tv_nsec * 0.001; tv->tv_usec = tp.tv_nsec * 0.001;
return ret; return ret;