diff --git a/RingWinClient.pro b/RingWinClient.pro index a99ae1277e72b05366dde65ea528dfb8c0ae679e..d49d31fcec10164386a24a43b2c2f052a764afb9 100644 --- a/RingWinClient.pro +++ b/RingWinClient.pro @@ -155,7 +155,7 @@ FORMS += mainwindow.ui \ photoboothwidget.ui \ deletecontactdialog.ui -win32: LIBS += -lole32 -luuid -lshlwapi +win32: LIBS += -lole32 -luuid -lshlwapi -lgdi32 LIBS += -lqrencode INCLUDEPATH += $${RING}/include/libringclient @@ -270,7 +270,7 @@ win32 { $$RUNTIMEDIR/libfreetype-6.dll $$RUNTIMEDIR/libglib-2.0-0.dll \ $$RUNTIMEDIR/libharfbuzz-0.dll \ $$RUNTIMEDIR/libintl-8.dll $$RUNTIMEDIR/libpcre-1.dll \ - $$RUNTIMEDIR/libpcre16-0.dll $$RUNTIMEDIR/libpng16-16.dll \ + $$RUNTIMEDIR/libpcre2-16-0.dll $$RUNTIMEDIR/libpng16-16.dll \ $$RUNTIMEDIR/libjpeg-62.dll $$RUNTIMEDIR/iconv.dll \ $$RUNTIMEDIR/libidn-11.dll $$RUNTIMEDIR/liblzma-5.dll \ $$RUNTIMEDIR/libGLESv2.dll $$RUNTIMEDIR/libbz2-1.dll \ diff --git a/docker/Dockerfile b/docker/Dockerfile index 810aaceb47f77f3df72feca70b632fa9d9b329ba..636617320fa77222e3bb1b9e7f209b2ff16e1ada 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:25 +FROM fedora:27 ENV LANG en_US.utf8 ENV LC_ALL en_US.utf8 @@ -8,7 +8,8 @@ RUN dnf -y upgrade # General RUN dnf -y install \ unzip \ - openssh + openssh \ + rsync # Mingw 32/64 RUN dnf -y install \