The windows-x86 is now from MXE.

See http://mxe.cc

Makefile

@@ -1,5 +1,5 @@
 DOCKER = docker
-IMAGE = thewtex/cross-compilers
+IMAGE = thewtex/cross-compiler
 
 android-arm:
 	$(DOCKER) build -t $(IMAGE)-android-arm linux-arm
@@ -19,13 +19,13 @@ linux-armv6:
 linux-armv7:
 	$(DOCKER) build -t $(IMAGE)-linux-armv7 linux-armv7
 
-windows-x86:
+windows-x86: base windows-x86/Dockerfile windows-x86/settings.mk
 	$(DOCKER) build -t $(IMAGE)-windows-x86 windows-x86
 
 windows-x64:
 	$(DOCKER) build -t $(IMAGE)-windows-x64 windows-x64
 
-base:
+base: Dockerfile
 	$(DOCKER) build -t $(IMAGE)-base .
 
 all: base android-arm darwin-x64 linux-x86 linux-x64 linux-armv6 linux-armv7 windows-x86 windows-x64

windows-x86/Dockerfile

@@ -1,12 +1,55 @@
-FROM steeve/cross-compiler:base
-MAINTAINER Steeve Morin "steeve.morin@gmail.com"
+FROM thewtex/cross-compiler-base
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
-RUN apt-get update && apt-get -y install mingw-w64
+# WINE is used as an emulator for try_run and tests with CMake.
+# Other dependencies are from the listed MXE requirements:
+#   http://mxe.cc/#requirements
+# 'cmake' is omitted because it is installed from source in the base image
+RUN apt-get update && apt-get -y install \
+  autoconf \
+  automake \
+  autopoint \
+  bash \
+  bison \
+  bzip2 \
+  flex \
+  gettext \
+  git \
+  g++ \
+  g++-multilib \
+  gperf \
+  intltool \
+  libffi-dev \
+  libtool-bin \
+  libltdl-dev \
+  libssl-dev \
+  libxml-parser-perl \
+  libc6-dev-i386 \
+  make \
+  openssl \
+  patch \
+  perl \
+  pkg-config \
+  python \
+  ruby \
+  scons \
+  sed \
+  unzip \
+  wget \
+  wine \
+  xz-utils
 
-ENV CROSS_TRIPLE i686-w64-mingw32
-ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV LD_LIBRARY_PATH ${CROSS_ROOT}/lib:${LD_LIBRARY_PATH}
+WORKDIR /usr/src
+# mxe master 2015-05-04
+RUN git clone https://github.com/mxe/mxe.git && \
+  cd mxe && \
+  git checkout e56d6e7876a0a5253c4cce10a9198f0203d56923
+WORKDIR /usr/src/mxe
+COPY settings.mk /usr/src/mxe/
+RUN make -j$(nproc)
 
-RUN cd /usr/bin && \
-    ln -s ${CROSS_TRIPLE}-gcc ${CROSS_TRIPLE}-cc
+ENV PATH ${PATH}:/usr/src/mxe/usr/bin
+ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
+RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
+
+WORKDIR /usr/src

windows-x86/settings.mk

@@ -0,0 +1,4 @@
+MXE_TARGETS := i686-w64-mingw32.static
+LOCAL_PKG_LIST := gcc
+.DEFAULT local-pkg-list:
+local-pkg-list: $(LOCAL_PKG_LIST)