Merge branch 'develop-evmcc' of https://github.com/imapp-pl/ethereum into develop-evmcc

CMakeLists.txt

@@ -176,8 +176,7 @@ if (NOT LANGUAGES)
 endif()
 
 if (EVMJIT)
-	add_subdirectory(libevmjit)
-	add_subdirectory(evmcc)
+	add_subdirectory(evmjit)
 endif()
 
 

eth/CMakeLists.txt

@@ -14,8 +14,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} gmp)
 
 if(EVMJIT)
-	target_link_libraries(${EXECUTABLE} evm)
-	target_link_libraries(${EXECUTABLE} evmjit)
+	target_link_libraries(${EXECUTABLE} evmjit-cpp)
 endif()
 
 if(MINIUPNPC_LS)

exp/CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
 
 if(EVMJIT)
-	target_link_libraries(${EXECUTABLE} evmjit)
+	target_link_libraries(${EXECUTABLE} evmjit-cpp)
 endif()
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")

libethereum/CMakeLists.txt

@@ -30,6 +30,7 @@ target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 target_link_libraries(${EXECUTABLE} gmp)
 if (EVMJIT)
 	target_link_libraries(${EXECUTABLE} evmjit)
+	target_link_libraries(${EXECUTABLE} evmjit-cpp)
 endif()
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

neth/CMakeLists.txt

@@ -23,8 +23,7 @@ target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()
 
 if(EVMJIT)
-	target_link_libraries(${EXECUTABLE} evm)
-	target_link_libraries(${EXECUTABLE} evmjit)
+	target_link_libraries(${EXECUTABLE} evmjit-cpp)
 endif()
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")

test/CMakeLists.txt

@@ -21,8 +21,7 @@ if(JSONRPC_LS)
 target_link_libraries(testeth web3jsonrpc)
 endif()
 if (EVMJIT)
-	target_link_libraries(testeth evm)
-	target_link_libraries(testeth evmjit)
+	target_link_libraries(testeth evmjit-cpp)
 endif()
 
 target_link_libraries(createRandomTest ethereum)
@@ -30,8 +29,7 @@ target_link_libraries(createRandomTest ethcore)
 target_link_libraries(createRandomTest boost_chrono)
 target_link_libraries(createRandomTest boost_unit_test_framework)
 if (EVMJIT)
-	target_link_libraries(createRandomTest evm)
-	target_link_libraries(createRandomTest evmjit)
+	target_link_libraries(createRandomTest evmjit-cpp)
 endif()
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")