Add the enet library (used in a friendly fork). For Windows, add mingw64-dlfcn and mingw64-physfs.

Author: UncombedCoconut

CHANGELOG.md

@@ -9,6 +9,9 @@
 - `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
 - `naev-windows` (Used to cross compile for Windows.)
 
+### v1.6.3
+Add the enet library (used in a friendly fork). For Windows, add mingw64-dlfcn and mingw64-physfs.
+
 ### v1.6.2
 Do the v1.6.1 change without bungling naev-macos/Dockerfile.amd64.
 

naev-linux-latest/Dockerfile.amd64

@@ -34,7 +34,7 @@ COPY --from=build /opt/luarocks /opt/luarocks
 ENV PATH "$PATH:/opt/luarocks/bin"
 
 # Install Build dependencies.
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build gcc binutils-devel fontconfig-devel freetype-devel \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build gcc binutils-devel enet-devel fontconfig-devel freetype-devel \
     gettext-devel glpk-devel file ffmpeg-free libpng12-devel libxml2-devel libvorbis-devel libwebp-devel libunibreak-devel \
     luajit-devel openal-soft-devel openblas-devel pcre2-devel physfs-devel SDL2-devel SDL2_image-devel suitesparse-devel \
 # Install utilities

naev-linux-lts/Dockerfile.amd64

@@ -16,7 +16,7 @@ RUN yum -y install epel-release && \
     rpm -i endpoint-repo.x86_64.rpm && \
     rm -rf /tmp/endpoint-repo.x86_64.rpm endpoint-rpmsign-7.pub && \
 # Install Build dependencies.
-    yum -y install meson ninja-build gcc binutils-devel fontconfig-devel freetype-devel \
+    yum -y install meson ninja-build gcc binutils-devel enet-devel fontconfig-devel freetype-devel \
     gettext-devel glpk-devel file libpng12-devel libxml2-devel libvorbis-devel libwebp-devel \
     libunibreak-devel luajit-devel openal-soft-devel openblas-devel pcre2-devel SDL2-devel \
     SDL2_image-devel \

naev-macos/Dockerfile.aarch64

@@ -49,7 +49,7 @@ RUN sed -i 's/\bopenssl rmd160\b/openssl rmd160 -provider legacy/g' $(command -v
 
 
 # Install required build dependencies
-RUN UNATTENDED=1 osxcross-macports install -arm64 freetype glpk libsdl2 libsdl2_image libpng \
+RUN UNATTENDED=1 osxcross-macports install -arm64 freetype glpk libenet libsdl2 libsdl2_image libpng \
     libvorbis luajit openal-soft OpenBLAS pcre2 physfs SuiteSparse_CHOLMOD SuiteSparse_CXSparse webp -v && \
     UNATTENDED=1 osxcross-macports clear-cache
 

naev-macos/Dockerfile.amd64

@@ -48,7 +48,7 @@ RUN sed -i 's/\bopenssl rmd160\b/openssl rmd160 -provider legacy/g' $(command -v
     sed -i 's/\bopenssl dgst -ripemd160 -verify\b/openssl dgst -provider default -provider legacy -ripemd160 -verify/g' $(command -v osxcross-macports)
 
 # Install required build dependencies
-RUN UNATTENDED=1 osxcross-macports install freetype glpk libsdl2 libsdl2_image libpng \
+RUN UNATTENDED=1 osxcross-macports install freetype glpk libenet libsdl2 libsdl2_image libpng \
     libvorbis luajit openal-soft OpenBLAS pcre2 physfs SuiteSparse_CHOLMOD SuiteSparse_CXSparse webp -v && \
     UNATTENDED=1 osxcross-macports clear-cache
 

naev-steamruntime/Dockerfile.amd64

@@ -10,7 +10,7 @@ ENV IMAGE_NAME "naev-steamruntime"
 # Install pip from steam/debian repositories.
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip \
 # Naughty: we need libwebp, ,libpcre2 and libopenblas, not in the SDK.... All are statically linked when building with the steamruntime option in meson set to true. Also, texinfo is an accidental build dependency for libbfd.
-    libopenblas-dev libwebp-dev libpcre2-dev texinfo && \
+    libenet-dev libopenblas-dev libwebp-dev libpcre2-dev texinfo && \
     apt-get clean && \
 # Upgrade meson via pip.
     python3 -m pip install meson --upgrade && \

naev-windows/Dockerfile.amd64

@@ -11,13 +11,23 @@ WORKDIR /tmp
 # Install build requirements
 RUN 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
-    mingw64-gcc mingw64-freetype mingw64-libvorbis mingw64-libxml2 mingw64-openal-soft \
-    mingw64-SDL2 mingw64-SDL2_image mingw64-libpng mingw32-nsis mingw64-pcre2 && \
+    mingw64-gcc mingw64-dlfcn mingw64-freetype mingw64-libvorbis mingw64-libxml2 mingw64-openal-soft \
+    mingw64-SDL2 mingw64-SDL2_image mingw64-libpng mingw32-nsis mingw64-pcre2 mingw64-physfs && \
     microdnf clean all && \
 # Install openblas for mingw (building this from source is an option but probably painful)
     curl -L -O https://github.com/xianyi/OpenBLAS/releases/download/v0.3.20/OpenBLAS-0.3.20-x64.zip && \
     unzip OpenBLAS-0.3.20-x64.zip -d /usr/x86_64-w64-mingw32/sys-root/mingw && \
     rm -rf OpenBLAS-0.3.20-x64.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-mingw32/sys-root/mingw --host=x86_64-w64-mingw32 && \
+    make -j && \
+    make install && \
+    sed -i 's/-lenet/-lenet -lws2_32 -lwinmm/' /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/libenet.pc && \
+    cd .. && \
+    rm -rf enet-1.3.17 enet-1.3.17.tar.gz
 
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1