diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-04-19 22:30:59 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-04-19 22:30:59 -0500 |
| commit | b31cc36de2cc612060b2db63f42a5af42756a719 (patch) | |
| tree | db2eec4f09f4feda0bbfaa9826220dcfb0452cb6 | |
| parent | 76dd4fee2f478979c68eba921a4f2c645fb88966 (diff) | |
| parent | 85dff323c8c3b376d4bc24b474c8fbaeba0acce8 (diff) | |
| download | monzero-gui-b31cc36de2cc612060b2db63f42a5af42756a719.tar.gz monzero-gui-b31cc36de2cc612060b2db63f42a5af42756a719.tar.xz monzero-gui-b31cc36de2cc612060b2db63f42a5af42756a719.zip | |
Merge pull request #3879
85dff32 cmake: bump windows deploy lib versions (selsta)
0468e0e workflows: deploy on windows (selsta)
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | cmake/Deploy.cmake | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7701c5c4..5a6fc870 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,9 @@ jobs: install: 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 mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt - name: build run: DEV_MODE=ON make release-win64 -j2 + - name: deploy + run: make deploy + working-directory: build/release - name: test qml run: build/release/bin/monero-wallet-gui --test-qml diff --git a/cmake/Deploy.cmake b/cmake/Deploy.cmake index 084db834..531e9d31 100644 --- a/cmake/Deploy.cmake +++ b/cmake/Deploy.cmake @@ -74,19 +74,19 @@ if(APPLE OR (WIN32 AND NOT STATIC)) ) if(CMAKE_BUILD_TYPE STREQUAL "Debug") list(APPEND WIN_DEPLOY_DLLS - libicudtd68.dll - libicuind68.dll - libicuiod68.dll - libicutud68.dll - libicuucd68.dll + libicudtd69.dll + libicuind69.dll + libicuiod69.dll + libicutud69.dll + libicuucd69.dll ) else() # assume release list(APPEND WIN_DEPLOY_DLLS - libicudt68.dll - libicuin68.dll - libicuio68.dll - libicutu68.dll - libicuuc68.dll + libicudt69.dll + libicuin69.dll + libicuio69.dll + libicutu69.dll + libicuuc69.dll ) endif() list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/") |