mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #4572
e7f24850
Fix Windows build after epee dependency change (iDunk5400)
This commit is contained in:
commit
636153b205
3 changed files with 2 additions and 5 deletions
|
@ -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()
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue