diff --git a/.gitignore b/.gitignore index 0122ceb..cd1224e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ dist/ compile_commands.json # SPACEBOX -BPmono.ttf sdl2-config # External symlinks diff --git a/Makefile b/Makefile index 29612ae..a2fea41 100644 --- a/Makefile +++ b/Makefile @@ -231,16 +231,16 @@ Cakefoot-linux_debug.x64 : $(LINUX_DEBUG_OBJ) $(CXX) $^ $(LFLAGS) -D__LINUX__ -o $(X64_DEBUG_BUILD_DIR)/$@ # Launch a docker container to build the game on Ubuntu 18.04 for compatibility with older Linux distributions. This requires -# Docker to be installed on the host system with the image cakefoot-ubuntu18. Use `src/Ubuntu18.Dockerfile` to build the image +# Docker to be installed on the host system with the image cakefoot-ubuntu18. Use `src/ubuntu18/Dockerfile` to build the image # before attempting this build if the image was not built yet. # -# sudo docker build src/Ubuntu18.Dockerfile +# sudo docker build src/ubuntu18/ Ubuntu-18 : sudo docker run --rm -v "$(shell pwd)/$(UBUNTU18_BUILD_DIR):/cakefoot/$(X64_BUILD_DIR)" cakefoot-ubuntu18 sh -c \ "cd cakefoot && git submodule foreach --recursive git pull origin main && git pull origin main &&\ - make CC=clang-8 CXX=clang++-8 EXTRA_PLATFORM_FLAGS='-D__UBUNTU18__' -j7 Cakefoot-linux.x64" - + make CC=clang-8 CXX=clang++-8 EXTRA_PLATFORM_FLAGS='-D__UBUNTU18__' -j7 Cakefoot-linux.x64 &&\ + useradd $(USER) && chgrp $(USER) $(X64_BUILD_DIR) -R && chown $(USER) $(X64_BUILD_DIR) -R" ############# # Web build # ############# diff --git a/resource/BPmono.ttf b/resource/BPmono.ttf new file mode 100644 index 0000000..e6bb690 Binary files /dev/null and b/resource/BPmono.ttf differ diff --git a/src/Ubuntu18.Dockerfile b/src/ubuntu18/Dockerfile similarity index 93% rename from src/Ubuntu18.Dockerfile rename to src/ubuntu18/Dockerfile index 69aa586..4574ddc 100644 --- a/src/Ubuntu18.Dockerfile +++ b/src/ubuntu18/Dockerfile @@ -12,14 +12,14 @@ # # Build with the tag "cakefoot-ubuntu18" for compatbility with the Makefile. # -# sudo docker build -t cakefoot-ubuntu18 src/Ubuntu18.Dockerfile +# sudo docker build -t cakefoot-ubuntu18 src/ubuntu18/ FROM ubuntu:18.04 RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt update && \ apt upgrade -y && \ - apt install -y wget build-essential clang-8 git rsync && \ + apt install -y wget build-essential clang-8 git rsync zip && \ apt build-dep -y libsdl2 && \ apt clean -y && apt autoclean -y && \ rm -rf /var/lib/apt/lists/* && \