diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build deleted file mode 100644 index 6f4d7ef..0000000 --- a/source/misc/docker/Dockerfile.Fedora29build +++ /dev/null @@ -1,23 +0,0 @@ -FROM fedora:29 - -RUN dnf -y install cmake \ -make \ -gcc-c++ \ -SDL2-devel \ -boost-devel \ -fmt-devel \ -physfs-devel \ -SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel \ -findutils \ -gettext \ -zip \ -&& dnf -y clean all - -COPY . /staging/blockattack-game - -ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT - -RUN cd /staging/blockattack-game && \ -./packdata.sh && \ -cmake . && \ -make diff --git a/source/misc/docker/Dockerfile.Fedora42build b/source/misc/docker/Dockerfile.Fedora42build new file mode 100644 index 0000000..25ae487 --- /dev/null +++ b/source/misc/docker/Dockerfile.Fedora42build @@ -0,0 +1,23 @@ +FROM fedora:42 + +RUN dnf -y install cmake \ +make \ +gcc-c++ \ +SDL2-devel \ +boost-devel \ +fmt-devel \ +physfs-devel \ +SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel \ +findutils \ +gettext \ +zip \ +&& dnf -y clean all + +COPY . /staging/blockattack-game + +ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT + +RUN cd /staging/blockattack-game && \ +./packdata.sh && \ +cmake . && \ +make diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone index af8d5b0..b8679f9 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone @@ -1,5 +1,9 @@ FROM ubuntu:18.04 +RUN apt-get update && apt-get install -y software-properties-common + +RUN add-apt-repository ppa:savoury1/gcc-defaults-11 + RUN apt-get update && apt-get install -y build-essential cmake pkg-config libfreetype6-dev libvorbis-dev libgl1-mesa-dev libpulse-dev zip gettext diff --git a/source/misc/standalone/compile_requirements.sh b/source/misc/standalone/compile_requirements.sh index 253721e..04a45bb 100755 --- a/source/misc/standalone/compile_requirements.sh +++ b/source/misc/standalone/compile_requirements.sh @@ -4,8 +4,8 @@ set -x set -u set -o pipefail -mkdir -p /staging/deps && cd /staging/deps && curl -L https://github.com/libsdl-org/SDL/releases/download/release-2.30.2/SDL2-2.30.2.tar.gz | tar -zx && cd SDL2-2.30.2 && ls -lrt -cd /staging/deps/SDL2-2.30.2 && ./configure --enable-shared --enable-static && make && make install +mkdir -p /staging/deps && cd /staging/deps && curl -L https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz | tar -zx && cd SDL2-2.32.10 && ls -lrt +cd /staging/deps/SDL2-2.32.10 && ./configure --enable-shared --enable-static && make && make install #https://github.com/libsdl-org/SDL_image/releases/download/release-2.6.2/SDL2_image-2.6.2.tar.gz mkdir -p /staging/deps && cd /staging/deps && curl -L https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.2/SDL2_image-2.8.2.tar.gz | tar -zx && cd SDL2_image-2.8.2 && ls -lrt @@ -27,9 +27,9 @@ cd /staging/deps/physfs-3.0.2 && cmake . && make && make install cd ~ mkdir -p Downloads cd Downloads -curl https://files.poulsander.com/~poul19/public_files/boost_1_65_1.tar.bz2 -O -tar xvfj boost_1_65_1.tar.bz2 -pushd boost_1_65_1 +curl https://archives.boost.io/release/1.89.0/source/boost_1_89_0.tar.bz2 -O +tar xvfj boost_1_89_0.tar.bz2 +pushd boost_1_89_0 ./bootstrap.sh --with-libraries=program_options ./b2 install -j 2 --prefix=/usr link=static popd