diff --git a/mxe_openarena_builder/Dockerfile b/mxe_openarena_builder/Dockerfile index e1a4853..25c107f 100644 --- a/mxe_openarena_builder/Dockerfile +++ b/mxe_openarena_builder/Dockerfile @@ -1,6 +1,11 @@ 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-curl 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 zip && rm -rf /var/lib/apt/lists/* + +WORKDIR /usr/src/mxe + +RUN make vorbis curl sdl2 openal 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 9fc74d8..cba0f59 100755 --- a/mxe_openarena_builder/engine_compile_script.sh +++ b/mxe_openarena_builder/engine_compile_script.sh @@ -21,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 USE_LOCAL_HEADERS=0 +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/src/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