From fa5dbdfb42b9e02ad4c2d470feaab0c0d1e05c0e Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Thu, 6 May 2021 00:40:39 +0100
Subject: [PATCH] MXE: Minor cleanup

---
 toolchains/mxe/Dockerfile.m4 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/toolchains/mxe/Dockerfile.m4 b/toolchains/mxe/Dockerfile.m4
index 8d0428f..9fe3f56 100644
--- a/toolchains/mxe/Dockerfile.m4
+++ b/toolchains/mxe/Dockerfile.m4
@@ -36,6 +36,9 @@ ENV MXE_DIR=/opt/mxe-src \
 	MXE_PREFIX_DIR=/opt/mxe \
 	`MXE_VERSION'=MXE_VERSION
 
+# Add MXE bin directory to PATH
+ENV PATH=$PATH:${MXE_PREFIX_DIR}/bin
+
 local_package(toolchain)
 
 # Install CMake now as it's used for several packages later as it's cleaner
@@ -60,18 +63,16 @@ mxe_package(libmad)
 
 mxe_package(ogg)
 
-mxe_package(theora)
-
 mxe_package(vorbis)
 
+mxe_package(theora)
+
 mxe_package(flac)
 
 mxe_package(libmpeg2)
 
 mxe_package(a52dec)
 
-# No iconv as Win32 API is used instead
-
 local_mxe_package(curl-light)
 
 mxe_package(freetype-bootstrap)
@@ -80,6 +81,8 @@ mxe_package(fribidi)
 
 mxe_package(glew)
 
+mxe_package(libiconv)
+
 local_mxe_package(sdl2)
 
 mxe_package(sdl2_net)