updated to latest Monero PR's.

This commit is contained in:
moneroexamples 2017-02-12 09:48:56 +08:00
parent 3f9a8b96a4
commit c532b7f675
4 changed files with 16 additions and 3 deletions

1
.gitignore vendored
View File

@ -3,4 +3,5 @@
*.*~
*.user
.idea/
*.log
cmake-build-debug/

View File

@ -61,6 +61,10 @@ add_library(cryptoxmr STATIC IMPORTED)
set_property(TARGET cryptoxmr
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcrypto.a)
add_library(cryptonote_basic STATIC IMPORTED)
set_property(TARGET cryptonote_basic
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_basic.a)
add_library(cryptonote_core STATIC IMPORTED)
set_property(TARGET cryptonote_core
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_core.a)
@ -69,6 +73,10 @@ add_library(cryptonote_protocol STATIC IMPORTED)
set_property(TARGET cryptonote_protocol
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_protocol.a)
add_library(daemonizer STATIC IMPORTED)
set_property(TARGET daemonizer
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libdaemonizer.a)
add_library(mnemonics STATIC IMPORTED)
set_property(TARGET mnemonics
PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libmnemonics.a)
@ -176,9 +184,11 @@ set(LIBRARIES
myext
mstch
wallet
blockchain_db
cryptonote_core
cryptonote_protocol
blockchain_db
cryptonote_basic
daemonizer
cryptoxmr
blocks
lmdb

View File

@ -19,7 +19,7 @@
#include "net/http_client.h"
#include "storages/http_abstract_invoke.h"
#include "cryptonote_core/cryptonote_basic.h"
//#include "cryptonote_core/cryptonote_basic.h"
#include "cryptonote_core/tx_pool.h"
#include "cryptonote_core/blockchain.h"
#include "blockchain_db/lmdb/db_lmdb.h"

View File

@ -45,7 +45,9 @@ namespace xmreg
timeout_time_ms = std::chrono::milliseconds {timeout_time};
m_http_client.set_server(deamon_url);
m_http_client.set_server(
deamon_url,
boost::optional<epee::net_utils::http::login>{});
}
bool