diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5d15d..1230e1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.) - `naev-windows` (Used to cross compile for Windows.) +### v1.10.2 +- Require modern Meson for naev-linux as well; install C++ compiler for Windows. + ### v1.10.1 - Checkout `upcoming` branch of naev-website when building naev-docs diff --git a/naev-linux-latest/Dockerfile b/naev-linux-latest/Dockerfile index 384b2bd..3f4fffd 100644 --- a/naev-linux-latest/Dockerfile +++ b/naev-linux-latest/Dockerfile @@ -40,6 +40,8 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build # Install utilities git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar texinfo xz unzip zip && \ microdnf clean all && \ +# Need Meson >=1.2.0 for fancy wrap files. + python3 -m pip install meson --upgrade # Verify tool versions and install locations. echo "Verifying python install" && \ command -v python3 && \ diff --git a/naev-macos/Dockerfile b/naev-macos/Dockerfile index 6ff075e..7655c0f 100644 --- a/naev-macos/Dockerfile +++ b/naev-macos/Dockerfile @@ -104,7 +104,7 @@ ENV APPIMAGE_EXTRACT_AND_RUN 1 # Install build tools. RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml unzip tar texinfo xz zlib zip && \ microdnf clean all && \ -# Need Meson >=0.63.1 to avoid passing linker args which don't work. +# Need Meson >=1.2.0 for fancy wrap files. python3 -m pip install meson --upgrade && \ # Verify tool version. echo "Verifying meson install" && \ diff --git a/naev-windows/Dockerfile b/naev-windows/Dockerfile index 00701b4..162613a 100644 --- a/naev-windows/Dockerfile +++ b/naev-windows/Dockerfile @@ -14,7 +14,7 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install gcc gettext git me # 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). - mingw64-gcc mingw64-dlfcn mingw64-freetype mingw64-libvorbis mingw64-libxml2 mingw64-openal-soft \ + mingw64-gcc mingw64-g++ 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)