From 94445f71845deda8c7aa97d6407bdddd544e7ed3 Mon Sep 17 00:00:00 2001 From: Faraz Fallahi Date: Tue, 3 Oct 2017 16:48:37 -0500 Subject: [PATCH] Update Dockerfile --- windows/Dockerfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/windows/Dockerfile b/windows/Dockerfile index d7e89da..65afa91 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -3,17 +3,20 @@ MAINTAINER Faraz Fallahi RUN \ apt -y update && \ apt -y upgrade && \ -apt -y install build-essential cmake git iputils-ping nano perl python wget && \ -apt -y install mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev && \ -apt -y install zlib1g-dev libssl-dev libnss3-dev libmysqlclient-dev libsqlite3-dev libxslt-dev libxml2-dev libjpeg-dev libpng-dev libopus-dev && \ -apt -y install libxcursor-dev libxcb1-dev libxcb-xkb-dev libx11-xcb-dev libxrender-dev libxi-dev libxcb-xinerama0-dev && \ -apt -y install autoconf automake autopoint bash bison bzip2 flex gettext git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev libtool libltdl-dev libssl-dev libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils && \ -apt -y install g++-multilib libc6-dev-i386 libtool-bin && \ +apt -y install 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 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 && \ cd /opt && \ git clone https://github.com/mxe/mxe.git && \ cd mxe && \ -make -j 16 qt5 MXE_TARGETS=i686-w64-mingw32.static && \ +make -j $(($(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)+2)) MXE_TARGETS='i686-w64-mingw32.static' qtbase && \ +/opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 --version exit 0 ENV PATH="${PATH}:/opt/mxe/usr/bin"