sveneh
000e46cb24
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
windows/LibEthereum.vcxproj
windows/LibEthereum.vcxproj.filters
Solved by removing files (not necessary anymore)
2014-12-12 23:42:28 +01:00
sveneh
8e9659752d
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
windows/LibEthereum.vcxproj
windows/LibEthereum.vcxproj.filters
Solved by removing files (not necessary anymore)
2014-12-12 23:42:28 +01:00
sveneh
8fd474d10b
use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed the
...
requirement to use EXACT version numbers for dependencies, cleanup
2014-11-27 20:01:34 +01:00
sveneh
5c19ce88ff
Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancement
...
This basically pulls in libjson-rpc-cpp 0.3.2, updated from previous
0.2.1. v0.3.2 completely changes its own setup, hence such a massive
change
builds fine on Ubuntu, needs check on OS X
Conflicts:
CMakeLists.txt
cmake/EthDependenciesDeprecated.cmake
eth/CMakeLists.txt
libqethereum/CMakeLists.txt
libweb3jsonrpc/CMakeLists.txt
neth/CMakeLists.txt
test/CMakeLists.txt
2014-11-20 10:55:36 +01:00
sveneh
9be7f3c030
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
libdevcrypto/EC.cpp -> accept-incoming
2014-11-16 21:40:56 +01:00
sveneh
74a49676be
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
alethzero/CMakeLists.txt
cmake/EthDependenciesDeprecated.cmake
libdevcrypto/CryptoPP.h
libdevcrypto/EC.cpp
third/CMakeLists.txt
2014-11-11 15:04:19 +01:00
sveneh
c492df94fb
compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies
2014-11-10 20:31:15 +01:00
sveneh
0956402469
full project compile with crypto++ dependency
2014-11-06 15:56:00 +01:00
sveneh
935b56755d
... addition to last commit, these were lost.
2014-11-06 10:41:37 +01:00
sveneh