diff --git a/naev-windows/Dockerfile b/naev-windows/Dockerfile index 89cb016..a9d67db 100644 --- a/naev-windows/Dockerfile +++ b/naev-windows/Dockerfile @@ -15,26 +15,13 @@ COPY _copr:copr.fedorainfracloud.org:jackgreiner:ucrt64-libraries.repo /etc/yum. RUN microdnf update -y && \ microdnf --nodocs --setopt=install_weak_deps=0 -y install gcc gettext git meson ninja-build python3-pyyaml tar texinfo xz unzip zip \ # Install mingw64 packages -# Note to selves: mingw64-dlfcn is: -# - to be added with great caution in any case: Fedora's hardened build flags make it depend on libssp-0.dll, -# and test-runs under Wine 7.12 showed a startup hang if libssp-0.dll was bundled (as our installer does). - ucrt64-gcc ucrt64-gcc-c++ ucrt64-dlfcn ucrt64-freetype ucrt64-libvorbis ucrt64-libxml2 \ + ucrt64-gcc ucrt64-gcc-c++ ucrt64-dlfcn ucrt64-enet ucrt64-freetype ucrt64-libvorbis ucrt64-libxml2 \ ucrt64-openal-soft ucrt64-SDL2 ucrt64-SDL2_image ucrt64-libpng mingw32-nsis ucrt64-pcre2 ucrt64-physfs && \ microdnf clean all && \ # Install openblas for mingw (building this from source is an option but probably painful) curl -L -O https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.28/OpenBLAS-0.3.28-x64-64.zip && \ unzip OpenBLAS-0.3.28-x64-64.zip -d /usr/x86_64-w64-mingw32ucrt/sys-root/mingw && \ - rm -rf OpenBLAS-0.3.28-x64-64.zip && \ -# Install cross-build of enet - curl -L -O http://enet.bespin.org/download/enet-1.3.17.tar.gz && \ - tar zxf enet-1.3.17.tar.gz && \ - cd enet-1.3.17 && \ - ./configure --prefix=/usr/x86_64-w64-mingw32ucrt/sys-root/mingw --host=x86_64-w64-mingw32ucrt && \ - make -j && \ - make install && \ - sed -i 's/-lenet/-lenet -lws2_32 -lwinmm/' /usr/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/pkgconfig/libenet.pc && \ - cd .. && \ - rm -rf enet-1.3.17 enet-1.3.17.tar.gz + rm -rf OpenBLAS-0.3.28-x64-64.zip # Force appimages to run in extract mode since FUSE is not available ENV APPIMAGE_EXTRACT_AND_RUN 1