diff options
| author | winsvega <winsvega@mail.ru> | 2016-04-06 18:54:18 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2016-04-06 18:54:18 +0800 |
| commit | 737623cd0c437bda2707a22ef17a637fbfcd7916 (patch) | |
| tree | 5d4c899f7a970ebf091694632a872cb1c4733079 /lllc | |
| parent | 12797ed6c9afacd7f5a2b8538ccf0032bbc15a19 (diff) | |
| parent | d2cee6f9c6babdf8c857e9860d68b6876d71a7eb (diff) | |
| download | dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar.gz dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar.bz2 dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar.lz dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar.xz dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.tar.zst dexon-solidity-737623cd0c437bda2707a22ef17a637fbfcd7916.zip | |
Merge pull request #471 from winsvega/libevmcore
move libevmcore to solidity
Diffstat (limited to 'lllc')
| -rw-r--r-- | lllc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lllc/main.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt index 989b8cbf..a897e663 100644 --- a/lllc/CMakeLists.txt +++ b/lllc/CMakeLists.txt @@ -6,7 +6,7 @@ file(GLOB HEADERS "*.h") include_directories(BEFORE ..) add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo) +eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo Solidity::evmasm) install( TARGETS ${EXECUTABLE} DESTINATION bin ) diff --git a/lllc/main.cpp b/lllc/main.cpp index 5f3078c2..2c3b6a64 100644 --- a/lllc/main.cpp +++ b/lllc/main.cpp @@ -25,10 +25,11 @@ #include <liblll/Compiler.h> #include <libdevcore/CommonIO.h> #include <libdevcore/CommonData.h> -#include <libevmcore/Instruction.h> +#include <libevmasm/Instruction.h> #include "ethereum/BuildInfo.h" using namespace std; using namespace dev; +using namespace dev::solidity; using namespace dev::eth; void help() |