From f4a4f2089721bbe107625a27c1de07e68b738b56 Mon Sep 17 00:00:00 2001
From: Faraz Fallahi <fffaraz@gmail.com>
Date: Tue, 26 May 2020 23:26:06 -0400
Subject: [PATCH] update

---
 README.md                           | 12 ++++++-----
 {static => linux-static}/Dockerfile |  0
 {windows => windows-x64}/Dockerfile |  1 -
 windows-x86/Dockerfile              | 31 +++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)
 rename {static => linux-static}/Dockerfile (100%)
 rename {windows => windows-x64}/Dockerfile (97%)
 create mode 100644 windows-x86/Dockerfile

diff --git a/README.md b/README.md
index 43a04cd..3f2057d 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,17 @@ docker run --rm -it -v $(pwd):/app fffaraz/qt
 
 * Linux Statically Linked
 ```
-cd static
+cd linux-static
 docker build --force-rm -t fffaraz/qt:static .
 docker run --rm -it -v $(pwd):/app fffaraz/qt:static
 ```
 
 * Windows Cross-compiled Statically Linked
 ```
-cd windows
-docker build --force-rm -t fffaraz/qt:windows .
-docker run --rm -it -v $(pwd):/app fffaraz/qt:windows
-cd /app && qmake && make -j $(nproc)
+cd windows-x64
+docker build --force-rm -t fffaraz/qt:windows64 .
+docker run --rm -it -v $(pwd):/app fffaraz/qt:windows64
+cd /app
+qmake
+make -j $(nproc)
 ```
diff --git a/static/Dockerfile b/linux-static/Dockerfile
similarity index 100%
rename from static/Dockerfile
rename to linux-static/Dockerfile
diff --git a/windows/Dockerfile b/windows-x64/Dockerfile
similarity index 97%
rename from windows/Dockerfile
rename to windows-x64/Dockerfile
index 8d08d14..d8a1f38 100644
--- a/windows/Dockerfile
+++ b/windows-x64/Dockerfile
@@ -29,4 +29,3 @@ exit 0
 ENV PATH="${PATH}:/opt/mxe/usr/bin"
 
 # qt5 qtmultimedia
-# i686-w64-mingw32
diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile
new file mode 100644
index 0000000..9f74420
--- /dev/null
+++ b/windows-x86/Dockerfile
@@ -0,0 +1,31 @@
+FROM ubuntu:latest
+ENTRYPOINT ["/bin/bash"]
+
+RUN \
+apt -y update && \
+apt -y upgrade && \
+apt -y install build-essential iputils-ping nano \
+    autoconf automake autopoint bash bison bzip2 flex gettext \
+    git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
+    libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \
+    openssl p7zip-full patch perl pkg-config python ruby scons \
+    sed unzip wget xz-utils \
+    g++-multilib libc6-dev-i386 && \
+apt -y autoremove && \
+apt -y autoclean && \
+apt -y clean && \
+exit 0
+
+RUN \
+cd /opt && \
+git clone https://github.com/mxe/mxe.git && \
+cd /opt/mxe && \
+NPROC=$(($(nproc)+4)) && \
+make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='i686-w64-mingw32.static' qtbase && \
+ln -s /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \
+qmake --version && \
+exit 0
+
+ENV PATH="${PATH}:/opt/mxe/usr/bin"
+
+# qt5 qtmultimedia