diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-18 22:04:11 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-18 22:04:11 +0200 |
| commit | 71c6b248935ca17af6a5c62f6de05670301861a2 (patch) | |
| tree | 7809cb8c013c655388b18e8754cd0d2eb3e298a9 | |
| parent | Merge pull request #5463 (diff) | |
| parent | Windows: work around a boost 1.70 and cmake SNAFU (diff) | |
| download | monero-71c6b248935ca17af6a5c62f6de05670301861a2.tar.xz | |
Merge pull request #5464
0f52fe4c Windows: work around a boost 1.70 and cmake SNAFU (iDunk5400)
b414b69f Windows: fix a build error in MSYS2 with boost 1.70.0 (iDunk5400)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/common/util.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f40021764..c19c9dba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -878,6 +878,7 @@ set(OLD_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) if(STATIC) if(MINGW) set(CMAKE_FIND_LIBRARY_SUFFIXES .a) + set(Boost_NO_BOOST_CMAKE ON) endif() set(Boost_USE_STATIC_LIBS ON) diff --git a/src/common/util.cpp b/src/common/util.cpp index 3388974ce..db5aa3052 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -69,6 +69,9 @@ using namespace epee; #include "net/http_client.h" // epee::net_utils::... #ifdef WIN32 +#ifndef STRSAFE_NO_DEPRECATE +#define STRSAFE_NO_DEPRECATE +#endif #include <windows.h> #include <shlobj.h> #include <strsafe.h> |