aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2014-10-24 20:21:20 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2014-10-24 20:21:20 +0800
commitb072b8687a9eaff8933a49910c22908497499e96 (patch)
tree430689bb981539227a266d862e19abadcd59651e
parent5bedf3c21f8efdb7d8a68d12616dd1d65cf7efd5 (diff)
downloaddexon-solidity-b072b8687a9eaff8933a49910c22908497499e96.tar.gz
dexon-solidity-b072b8687a9eaff8933a49910c22908497499e96.tar.zst
dexon-solidity-b072b8687a9eaff8933a49910c22908497499e96.zip
ethrpc -> web3jsonrpc, other issues fixed
-rw-r--r--CMakeLists.txt4
-rw-r--r--jsonrpc.cpp4
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d5e6691..624c64fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,9 @@ target_link_libraries(testeth gmp)
target_link_libraries(testeth solidity)
target_link_libraries(testeth ${CRYPTOPP_LS})
target_link_libraries(testeth webthree)
-target_link_libraries(testeth ethrpc)
+if(JSONRPC_LS)
+target_link_libraries(testeth web3jsonrpc)
+endif()
target_link_libraries(createRandomTest ethereum)
target_link_libraries(createRandomTest ethcore)
diff --git a/jsonrpc.cpp b/jsonrpc.cpp
index ff2e3a5b..10b890c5 100644
--- a/jsonrpc.cpp
+++ b/jsonrpc.cpp
@@ -27,8 +27,8 @@
#include <libdevcore/CommonIO.h>
#include <libdevcore/CommonJS.h>
#include <libwebthree/WebThree.h>
-#include <libethrpc/WebThreeStubServer.h>
-#include <libethrpc/CorsHttpServer.h>
+#include <libweb3jsonrpc/WebThreeStubServer.h>
+#include <libweb3jsonrpc/CorsHttpServer.h>
#include <jsonrpc/connectors/httpserver.h>
#include <jsonrpc/connectors/httpclient.h>
#include <set>