diff --git a/msys2/autobuild.sh b/msys2/autobuild.sh index 50f0c891d..d51b5948c 100644 --- a/msys2/autobuild.sh +++ b/msys2/autobuild.sh @@ -39,7 +39,7 @@ for i in $( ls ); do mkdir -p "$buildDir/$i/firmware_win/JTAG Only" mkdir -p "$buildDir/$i/Windows Driver" #you have to thank QT5 for all that dlls - cp $mingwDir/bin/{libbz2-1.dll,libfreetype-6.dll,libgcc_s_dw2-1.dll,libglib-2.0-0.dll,libgraphite2.dll,libharfbuzz-0.dll,libiconv-2.dll,libicudt61.dll,libicuin61.dll,libicuuc61.dll,libintl-8.dll,libpcre-1.dll,libpcre2-16-0.dll,libpng16-16.dll,libreadline7.dll,libstdc++-6.dll,libtermcap-0.dll,libwinpthread-1.dll,Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,zlib1.dll,libgcc_s_seh-1.dll} $buildDir/$i/win$arch + cp $mingwDir/bin/{libbz2-1.dll,libfreetype-6.dll,libgcc_s_dw2-1.dll,libglib-2.0-0.dll,libgraphite2.dll,libharfbuzz-0.dll,libiconv-2.dll,libicudt61.dll,libicuin61.dll,libicuuc61.dll,libintl-8.dll,libpcre-1.dll,libpcre2-16-0.dll,libpng16-16.dll,libreadline7.dll,libstdc++-6.dll,libtermcap-0.dll,libwinpthread-1.dll,Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,zlib1.dll,libgcc_s_seh-1.dll,libjansson-4.dll} $buildDir/$i/win$arch cp -r /autobuild/* $buildDir/$i/win$arch cp -r $pm3Dir/$i/client/{proxmark3.exe,flasher.exe,*.dic,lualibs,scripts,hardnested} $buildDir/$i/win$arch cp $mingwDir/share/qt5/plugins/platforms/qwindows.dll $buildDir/$i/win$arch/platforms diff --git a/msys2/etc/post-install/09-proxspace.post b/msys2/etc/post-install/09-proxspace.post index aa63c9fba..7ea0af1e9 100644 --- a/msys2/etc/post-install/09-proxspace.post +++ b/msys2/etc/post-install/09-proxspace.post @@ -5,11 +5,11 @@ maybe_proxspace () wget https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz pacman --noconfirm --force -U mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz rm mingw-w64-x86_64-gcc-*.tar.xz - pacman --noconfirm --force -S mingw-w64-x86_64-readline mingw-w64-x86_64-qt5 git make pkg-config + pacman --noconfirm --force -S mingw-w64-x86_64-readline mingw-w64-x86_64-qt5 git make pkg-config mingw-w64-x86_64-jansson fi if [ ! -d /mingw32/include/readline ] && [ "$MSYSTEM" == "MINGW32" ]; then - pacman --noconfirm --force -S mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config + pacman --noconfirm --force -S mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config mingw-w64-i686-jansson fi }