diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-05-10 13:19:00 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-05-10 13:19:00 -0500 |
| commit | cfa594e595eb11e8746015a7e395d41a44f94724 (patch) | |
| tree | 249fe60ac2e9c6cd6a09974004f7046f965023cb | |
| parent | abf823e38db11f75f5a1d6b0b0e0104300a59436 (diff) | |
| parent | 949e774a9f4abe622ce309c98de5221aa8435323 (diff) | |
| download | monzero-gui-cfa594e595eb11e8746015a7e395d41a44f94724.tar.gz monzero-gui-cfa594e595eb11e8746015a7e395d41a44f94724.tar.xz monzero-gui-cfa594e595eb11e8746015a7e395d41a44f94724.zip | |
Merge pull request #2155
949e774 msys2: fix windows build with trezor (mmbyday)
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | windeploy_helper.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -207,7 +207,7 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off 3. Install MSYS2 packages for Monero dependencies; the needed 64-bit packages have `x86_64` in their names ``` - pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi + pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb ``` Optional : To build the flag `WITH_SCANNER` diff --git a/windeploy_helper.sh b/windeploy_helper.sh index e0a3b3bb..76af67da 100644 --- a/windeploy_helper.sh +++ b/windeploy_helper.sh @@ -23,7 +23,7 @@ else ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.dll) fi -FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll) +FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll) platform=$(get_platform) |