Skip to content
Snippets Groups Projects
Commit a27331b6 authored by Aleksandr Lysikov's avatar Aleksandr Lysikov
Browse files

restore branch to working state after getting from master

parents 7ac6a005 52765b12
No related branches found
No related tags found
No related merge requests found
......@@ -60,6 +60,7 @@ add_subdirectory(libdap-chain-net-srv-app-db)
add_subdirectory(libdap-chain-net-srv-datum)
add_subdirectory(libdap-chain-net-srv-datum-pool)
add_subdirectory(libdap-chain-net-srv-vpn)
add_subdirectory(libdap-chain-mempool)
add_subdirectory(libdap-stream)
add_subdirectory(libdap-stream-ch)
......@@ -114,6 +115,7 @@ include_directories("${INCLUDE_DIRECTORIES} ${dap_chain_net_srv_datum_pool_INCLU
include_directories("${INCLUDE_DIRECTORIES} ${dap_chain_net_srv_vpn_INCLUDE_DIRS}")
include_directories("${INCLUDE_DIRECTORIES} ${dap_chain_wallet_INCLUDE_DIRS}")
include_directories("${INCLUDE_DIRECTORIES} ${dap_chain_global_db_INCLUDE_DIRS}")
include_directories("${INCLUDE_DIRECTORIES} ${dap_chain_mempool_INCLUDE_DIRS}")
add_definitions ("${monero_crypto_DEFINITIONS}")
add_definitions(" ${dap_core_DEFINITIONS}")
......@@ -152,6 +154,7 @@ add_definitions(" ${dap_chain_net_srv_datum_pool_DEFINITIONS}")
add_definitions(" ${dap_chain_net_srv_vpn_DEFINITIONS}")
add_definitions(" ${dap_chain_wallet_DEFINITIONS}")
add_definitions(" ${dap_chain_global_db_DEFINITIONS}")
add_definitions(" ${dap_chain_mempool_DEFINITIONS}")
#file(GLOB SERVER_SRCS *.c)
......@@ -175,7 +178,7 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_en
dap_chain_dag dap_chain_dag_cs dap_chain_dag_cs_poa dap_chain_dag_cs_hashgraph dap_chain_dag_cs_poh
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
dap_chain_net_srv_datum dap_chain_net_srv_datum_pool dap_chain_net_srv_vpn
dap_chain_wallet dap_chain_global_db m pthread magic )
dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic )
target_link_libraries(${PROJECT_NAME}-cli m )
target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_core_server dap_enc_server dap_udp_server dap_session
dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net
......@@ -184,7 +187,7 @@ target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_core_server d
dap_chain_dag dap_chain_dag_cs dap_chain_dag_cs_poa dap_chain_dag_cs_hashgraph dap_chain_dag_cs_poh
dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db
dap_chain_net_srv_datum dap_chain_net_srv_datum_pool dap_chain_net_srv_vpn
dap_chain_wallet dap_chain_global_db m pthread magic )
dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic )
target_include_directories(${PROJECT_NAME} INTERFACE .)
target_include_directories(${PROJECT_NAME}-tool INTERFACE .)
......
Subproject commit 7716e11a14e690e3d167731ed6eacbb410fc28c1
Subproject commit e4000ad6892061948b33727ab1b710e6d965514a
Subproject commit 929eded69030efe691b11d8d347f5723007ec8d0
Subproject commit db40965659a5ca22aadd231c35d30786b5bd0bc6
Subproject commit 1d935f75de8896ad165c9b4c4707e6171fd29f29
Subproject commit c6bcdd782ea47276d9d0f37c284f1aad2fafbfb4
......@@ -309,8 +309,7 @@ int main(int argc, const char * argv[])
// Streaming URLs
dap_stream_add_proc_http(DAP_HTTP(l_server), STREAM_URL);
dap_stream_ctl_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
dap_chain_mempool_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
dap_chain_mempool_add_proc(DAP_HTTP(l_server), MEMPOOL_URL);
// Built in WWW server
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment