Update naev-windows to include more packages to help build Rust branch.

Author: bobbens

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.12.3
+- Update `naev-windows` to include more packages to help build Rust branch
+
 ### v1.12.2
 - Update `naev-steamruntime` to build static libraries correctly and remove pre-installed OpenAL in favour of our own newer build
 

naev-windows/Dockerfile

@@ -15,6 +15,12 @@ COPY setup-devenv.sh /usr/bin
 
 RUN microdnf update -y && \
     microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gcc gettext git lld llvm meson ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
+# OK, seems like the rust is a bit a of mess as it is trying to compile some things internally with hardcoded mingw64 paths
+# We have to toss the dependencies here so that it works. In particular, mlua-sys seems to want to build luajit
+# Would make sense to try to use either only ucrt64 or mingw64 stuff someday
+    mingw64-binutils mingw64-gcc \
+    mingw64-libvorbis mingw64-win-iconv mingw64-openal-soft \
+    libvorbis-devel openal-soft-devel \
 # Install mingw64 packages
     ucrt64-gcc ucrt64-gcc-c++ ucrt64-dlfcn ucrt64-enet ucrt64-freetype ucrt64-libvorbis ucrt64-libxml2 ucrt64-libtiff \
     ucrt64-openal-soft ucrt64-SDL2 ucrt64-SDL2_image ucrt64-libpng mingw32-nsis ucrt64-pcre2 ucrt64-physfs && \

naev-windows/setup-devenv.sh

@@ -3,7 +3,7 @@
 # Print a message
 echo "Configuring the development environment"
 
-rustup-init -y -t x86_64-pc-windows-gnullvm
+rustup-init -y -t x86_64-pc-windows-gnu
 
 # Source the environment file
 source ~/.cargo/env