diff options
| -rw-r--r-- | Assembly.cpp | 2 | ||||
| -rw-r--r-- | Assembly.h | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | CodeFragment.cpp | 4 | ||||
| -rw-r--r-- | CodeFragment.h | 4 | ||||
| -rw-r--r-- | Compiler.h | 2 | ||||
| -rw-r--r-- | Parser.h | 2 |
7 files changed, 12 insertions, 18 deletions
diff --git a/Assembly.cpp b/Assembly.cpp index 0de16982..0fa12537 100644 --- a/Assembly.cpp +++ b/Assembly.cpp @@ -21,7 +21,7 @@ #include "Assembly.h" -#include <libethsupport/Log.h> +#include <libethential/Log.h> #include <libethcore/CommonEth.h> using namespace std; @@ -23,8 +23,9 @@ #include <iostream> #include <sstream> -#include <libethsupport/Common.h> -#include <libethcore/Instruction.h> +#include <libethential/Common.h> +#include <libevmface/Instruction.h> +#include <libethcore/SHA3.h> #include "Exceptions.h" namespace eth diff --git a/CMakeLists.txt b/CMakeLists.txt index dc5fc222..4117e6ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,17 +18,10 @@ endif() file(GLOB HEADERS "*.h") include_directories(..) -include_directories(${MINIUPNPC_ID}) -include_directories(${LEVELDB_ID}) - -target_link_libraries(${EXECUTABLE} ethcore) -target_link_libraries(${EXECUTABLE} ethsupport) -target_link_libraries(${EXECUTABLE} secp256k1) -target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS}) -target_link_libraries(${EXECUTABLE} ${LEVELDB_LS}) +target_link_libraries(${EXECUTABLE} ethential) +target_link_libraries(${EXECUTABLE} evmface) target_link_libraries(${EXECUTABLE} gmp) - if(${TARGET_PLATFORM} STREQUAL "w64") include_directories(/usr/x86_64-w64-mingw32/include/cryptopp) target_link_libraries(${EXECUTABLE} cryptopp) diff --git a/CodeFragment.cpp b/CodeFragment.cpp index 9284c1f3..2ad23471 100644 --- a/CodeFragment.cpp +++ b/CodeFragment.cpp @@ -24,8 +24,8 @@ #include <boost/algorithm/string.hpp> #include <boost/spirit/include/support_utree.hpp> -#include <libethsupport/Log.h> -#include <libethcore/Instruction.h> +#include <libethential/Log.h> +#include <libevmface/Instruction.h> #include <libethcore/CommonEth.h> #include "CompilerState.h" using namespace std; diff --git a/CodeFragment.h b/CodeFragment.h index 8e3ff1d7..b9d44c03 100644 --- a/CodeFragment.h +++ b/CodeFragment.h @@ -21,8 +21,8 @@ #pragma once -#include <libethsupport/Common.h> -#include <libethcore/Instruction.h> +#include <libethential/Common.h> +#include <libevmface/Instruction.h> #include "Assembly.h" #include "Exceptions.h" @@ -23,7 +23,7 @@ #include <string> #include <vector> -#include <libethsupport/Common.h> +#include <libethential/Common.h> namespace eth { @@ -23,7 +23,7 @@ #include <string> #include <vector> -#include <libethsupport/Common.h> +#include <libethential/Common.h> namespace boost { namespace spirit { class utree; } } namespace sp = boost::spirit; |