diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-16 12:43:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-16 12:43:13 +0200 |
| commit | 636153b2050aa0642ba86842c69ac55a5d81618d (patch) | |
| tree | 626b1d432d39b3111b081dd45e19a9bddb16985e | |
| parent | Merge pull request #4502 (diff) | |
| parent | Fix Windows build after epee dependency change (diff) | |
| download | monero-636153b2050aa0642ba86842c69ac55a5d81618d.tar.xz | |
Merge pull request #4572
e7f24850 Fix Windows build after epee dependency change (iDunk5400)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/daemonizer/windows_daemonizer.inl | 1 | ||||
| -rw-r--r-- | tests/functional_tests/CMakeLists.txt | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78d16b2ad..8baac02e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -880,7 +880,7 @@ endif() include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) if(MINGW) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj") - set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32) + set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt) if(DEPENDS) set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv) else() diff --git a/src/daemonizer/windows_daemonizer.inl b/src/daemonizer/windows_daemonizer.inl index 8077f29fb..7e61e3603 100644 --- a/src/daemonizer/windows_daemonizer.inl +++ b/src/daemonizer/windows_daemonizer.inl @@ -31,6 +31,7 @@ #include "common/util.h" #include "daemonizer/windows_service.h" #include "daemonizer/windows_service_runner.h" +#include "cryptonote_core/cryptonote_core.h" #include <shlobj.h> #include <boost/filesystem/operations.hpp> diff --git a/tests/functional_tests/CMakeLists.txt b/tests/functional_tests/CMakeLists.txt index 4b21b945c..7a2a7fbd1 100644 --- a/tests/functional_tests/CMakeLists.txt +++ b/tests/functional_tests/CMakeLists.txt @@ -26,10 +26,6 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -if(WIN32) - set(EXTRA_LIBRARIES "${EXTRA_LIBRARIES};bcrypt") -endif() - set(functional_tests_sources main.cpp transactions_flow_test.cpp |