diff options
| -rwxr-xr-x | build_single.sh | 8 | ||||
| -rw-r--r-- | monero_libwallet2_api_c/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build_single.sh b/build_single.sh index 6a3f8e1..741da68 100755 --- a/build_single.sh +++ b/build_single.sh @@ -329,23 +329,23 @@ pushd release/$repo rm ${HOST_ABI}_libwinpthread-1.dll.xz || true xz -e ${HOST_ABI}_libwinpthread-1.dll #### - cp /usr/lib/gcc/${HOST_ABI}/8.3-posix/libstdc++-6.dll ${HOST_ABI}_libstdc++-6.dll + cp /usr/lib/gcc/${HOST_ABI}/*-posix/libstdc++-6.dll ${HOST_ABI}_libstdc++-6.dll rm ${HOST_ABI}_libstdc++-6.dll.xz || true xz -e ${HOST_ABI}_libstdc++-6.dll #### - cp /usr/lib/gcc/${HOST_ABI}/8.3-posix/libssp-0.dll ${HOST_ABI}_libssp-0.dll + cp /usr/lib/gcc/${HOST_ABI}/*-posix/libssp-0.dll ${HOST_ABI}_libssp-0.dll rm ${HOST_ABI}_libssp-0.dll.xz || true xz -e ${HOST_ABI}_libssp-0.dll fi if [[ "$HOST_ABI" == "x86_64-w64-mingw32" ]]; then - cp /usr/lib/gcc/${HOST_ABI}/8.3-posix/libgcc_s_seh-1.dll ${HOST_ABI}_libgcc_s_seh-1.dll + cp /usr/lib/gcc/${HOST_ABI}/*-posix/libgcc_s_seh-1.dll ${HOST_ABI}_libgcc_s_seh-1.dll rm ${HOST_ABI}_libgcc_s_seh-1.dll.xz || true xz -e ${HOST_ABI}_libgcc_s_seh-1.dll fi if [[ "$HOST_ABI" == "i686-w64-mingw32" ]]; then - cp /usr/lib/gcc/${HOST_ABI}/8.3-posix/libgcc_s_sjlj-1.dll ${HOST_ABI}_libgcc_s_sjlj-1.dll + cp /usr/lib/gcc/${HOST_ABI}/*-posix/libgcc_s_sjlj-1.dll ${HOST_ABI}_libgcc_s_sjlj-1.dll rm ${HOST_ABI}_libgcc_s_sjlj-1.dll.xz || true xz -e ${HOST_ABI}_libgcc_s_sjlj-1.dll fi diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 86abff9..17202f6 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -308,7 +308,7 @@ endif() if(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") set_target_properties(wallet2_api_c PROPERTIES SUFFIX ".dll") - set(EXTRA_LIBS_WINDOWS wsock32 ws2_32 iconv-win iphlpapi crypt32 hidapi) + set(EXTRA_LIBS_WINDOWS ssp wsock32 ws2_32 iconv-win iphlpapi crypt32 hidapi) endif() if(${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch64-apple-darwin11" OR ${HOST_ABI} STREQUAL "host-apple-darwin" OR ${HOST_ABI} STREQUAL "host-apple-ios") |