commit 4bf3ee8c

Poul Sander · 2022-03-19 19:16
4bf3ee8c01d364368ebcfe1152204b4ae6f5de77 patch · browse files
parent a0c4e54550599cfac0b7469640b95bc5d3d3172c

Do a static compile

Changed files

M	mxe_openarena_builder/Dockerfile before
M	mxe_openarena_builder/engine_compile_script.sh before

diff --git a/mxe_openarena_builder/Dockerfile b/mxe_openarena_builder/Dockerfile index 51031f9..e1a4853 100644 --- a/mxe_openarena_builder/Dockerfile +++ b/mxe_openarena_builder/Dockerfile

@@ -1,6 +1,6 @@

FROM sago007/mxe_basic

MAINTAINER poul@poulsander.com

-RUN apt-get update && apt-get install -y mxe-i686-w64-mingw32.static-vorbis mxe-i686-w64-mingw32.static-sdl2 mxe-i686-w64-mingw32.static-sdl2 mxe-i686-w64-mingw32.static-openal zip

+RUN apt-get update && apt-get install -y mxe-i686-w64-mingw32.static-vorbis mxe-i686-w64-mingw32.static-curl mxe-i686-w64-mingw32.static-sdl2 mxe-i686-w64-mingw32.static-sdl2 mxe-i686-w64-mingw32.static-openal zip

RUN adduser --disabled-password --gecos "OpenArena user" openarena && \

mkdir -p /data && chmod 777 /data && \

diff --git a/mxe_openarena_builder/engine_compile_script.sh b/mxe_openarena_builder/engine_compile_script.sh index 97ec42b..9fc74d8 100755 --- a/mxe_openarena_builder/engine_compile_script.sh +++ b/mxe_openarena_builder/engine_compile_script.sh

@@ -1,9 +1,10 @@

#! /bin/bash

set -euo pipefail

cd /staging

-git clone git://github.com/OpenArena/engine.git

+git clone https://github.com/OpenArena/engine.git

#cp /tmp/libxmp-4.3.13/lib/libxmp.a /staging/engine/code/libs/win32/

cd engine

+#git checkout MatrixMultiply #Want to test a different branch? Check it out here

VERSION_ID=$(git log -1 --date=short --format="openarena_engine_windows_%cd_%H")

echo $VERSION_ID

ZIPFILE="/data/${VERSION_ID}.zip"

@@ -20,7 +21,7 @@ mkdir $STAGING_DIR

#mv /staging/engine/build/release-linux-x86_64/renderer_*_x86_64.so $STAGING_DIR/

#Windows version does not work at the moment

cd /staging/engine

-PLATFORM=mingw32 ARCH=x86 CC=i686-w64-mingw32.static-gcc WINDRES=i686-w64-mingw32.static-windres LD=i686-w64-mingw32.static-ld PKG_CONFIG_PATH=/usr/lib/mxe/usr/i686-w64-mingw32.static/lib/pkgconfig/ make USE_CODEC_XMP=0 USE_CURL=1

+PLATFORM=mingw32 ARCH=x86 CC=i686-w64-mingw32.static-gcc WINDRES=i686-w64-mingw32.static-windres LD=i686-w64-mingw32.static-ld PKG_CONFIG_PATH=/usr/lib/mxe/usr/i686-w64-mingw32.static/lib/pkgconfig/ make USE_CODEC_XMP=0 USE_CURL=1 USE_LOCAL_HEADERS=0

mv /staging/engine/build/release-mingw32-x86/*.exe $STAGING_DIR/

cd /staging

zip -r $VERSION_ID $VERSION_ID