commit c74c02a5

Poul Sander · 2021-10-07 14:44
c74c02a57940bc83989c14ae262a9d15c24a934a patch · browse files
parent db97c4bd6279860a4bffb5425259525f888d9f5f

Started using Ubuntu 16.04 instead of 12.04 for building the standalone. Still uses gcc-4.8.

Changed files

M	CMakeLists.txt before
A	source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone
M	source/misc/standalone/build_standalone.sh before

diff --git a/CMakeLists.txt b/CMakeLists.txt index 0049c97..07e391f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 3.7.2...3.18.4)

+cmake_minimum_required(VERSION 3.5.1...3.18.4)

project (blockattack)

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone new file mode 100644 index 0000000..4ab2533 --- /dev/null +++ b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone

@@ -0,0 +1,22 @@

+FROM ubuntu:16.04

+RUN apt-get update && apt-get install -y build-essential cmake pkg-config libfreetype6-dev libvorbis-dev libgl1-mesa-dev libpulse-dev libpng12-dev zip gettext

+RUN apt-get update && apt-get install -y python-software-properties && \

+apt-get update && \

+apt-get install -y gcc-4.8 g++-4.8 && \

+update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 && \

+update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50

+COPY source/misc/standalone/compile_requirements.sh /

+RUN /compile_requirements.sh

+COPY . /staging/blockattack-game

+ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT

+RUN cd /staging/blockattack-game && \

+./packdata.sh && \

+cmake -D Boost_USE_STATIC_LIBS=ON -D INSTALL_DATA_DIR=. -D CMAKE_INSTALL_PREFIX=. -D STANDALONE=1 . && make

diff --git a/source/misc/standalone/build_standalone.sh b/source/misc/standalone/build_standalone.sh index b117295..b3062b3 100755 --- a/source/misc/standalone/build_standalone.sh +++ b/source/misc/standalone/build_standalone.sh

@@ -17,7 +17,7 @@ chmod +x staging/$ARCHIVENAME/blockattack

cd ../../..

-docker build -f source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone . -t blockattack_test

+docker build -f source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone . -t blockattack_test

echo Copying to: $(pwd)/source/misc/standalone/staging/$ARCHIVENAME