diff --git a/libsodium b/libsodium index 3033271..561e556 160000 --- a/libsodium +++ b/libsodium @@ -1 +1 @@ -Subproject commit 3033271213aa083b49ec88c23d815af176fc12a2 +Subproject commit 561e556dad078af581f338fe3de9ee6362d28b16 diff --git a/stdafx.h b/stdafx.h index 7da2cf4..b6b567d 100644 --- a/stdafx.h +++ b/stdafx.h @@ -62,7 +62,7 @@ constexpr bool b_WINDOWS = false; static_assert(wxUSE_UNSAFE_WXSTRING_CONV == 1, R"(In fully utf environment, (wallet.manifest plus /utf-8 compile option) all string conversions are safe.)"); -static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 1 && wxRELEASE_NUMBER == 5 && wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets 3.1.5"); +static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 1 && wxRELEASE_NUMBER == 6 && wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets 3.1.5"); static_assert(wxUSE_IPV6 == 1, "IP6 unavailable in wxWidgets"); static_assert(WXWIN_COMPATIBILITY_3_0 == 0, "wxWidgets api out of date"); static_assert(wxUSE_COMPILER_TLS == (b_WINDOWS ? 2 : 1), "out of date workarounds in wxWidgets for windows bugs"); diff --git a/winConfigure.bat b/winConfigure.bat index f4fb7c0..4d20630 100644 --- a/winConfigure.bat +++ b/winConfigure.bat @@ -115,6 +115,13 @@ echo on .\x64\Debug\wallet.exe --complete --test echo off IF %ERRORLEVEL% NEQ 0 ( - echo failed unit test + echo failed unit test on debug build ) ELSE ( - echo passed unit test) + echo passed unit test on debug build) +echo on +.\x64\Release\wallet.exe --complete --test +echo off +IF %ERRORLEVEL% NEQ 0 ( + echo failed unit test on release build +) ELSE ( + echo passed unit test on release build) diff --git a/wxWidgets b/wxWidgets index 9c0a8be..35a6d7b 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 +Subproject commit 35a6d7b15fedfdb5198bb6c28b31cda33b2c2a76