From 3dcf30463b961e3fe47b48b2024bbf3d5b5ce675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 19 Jan 2015 18:39:19 +0100 Subject: [PATCH] Removing boost dependency from libevmjit --- CMakeLists.txt | 3 --- libevmjit-cpp/CMakeLists.txt | 3 +++ libevmjit/CMakeLists.txt | 1 - libevmjit/Common.h | 4 +--- libevmjit/Compiler.cpp | 1 + libevmjit/interface.cpp | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5193460076..4888de5238 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,6 @@ else() link_directories(/usr/lib/llvm-3.5/lib) endif() -# Boost -find_package(Boost REQUIRED) - add_subdirectory(libevmjit) if(EVMJIT_CPP) diff --git a/libevmjit-cpp/CMakeLists.txt b/libevmjit-cpp/CMakeLists.txt index 25be95177e..58375e4ee4 100644 --- a/libevmjit-cpp/CMakeLists.txt +++ b/libevmjit-cpp/CMakeLists.txt @@ -1,5 +1,8 @@ set(TARGET_NAME evmjit-cpp) +# Boost +find_package(Boost REQUIRED) + set(SOURCES Env.cpp JitVM.cpp JitVM.h diff --git a/libevmjit/CMakeLists.txt b/libevmjit/CMakeLists.txt index 96ec873f52..1990ec3987 100644 --- a/libevmjit/CMakeLists.txt +++ b/libevmjit/CMakeLists.txt @@ -15,7 +15,6 @@ add_library(${TARGET_NAME} SHARED ${SOURCES} ${HEADERS}) set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "libs") include_directories(${LLVM_INCLUDE_DIRS}) -include_directories(${Boost_INCLUDE_DIRS}) target_link_libraries(${TARGET_NAME} PRIVATE ${LLVM_LIBS}) target_link_libraries(${TARGET_NAME} PRIVATE gmp) diff --git a/libevmjit/Common.h b/libevmjit/Common.h index 179c7ab387..d0c5822365 100644 --- a/libevmjit/Common.h +++ b/libevmjit/Common.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace dev { @@ -13,8 +13,6 @@ namespace jit using byte = uint8_t; using bytes = std::vector; using bytes_ref = std::tuple; -using u256 = boost::multiprecision::uint256_t; -using bigint = boost::multiprecision::cpp_int; struct NoteChannel {}; // FIXME: Use some log library? diff --git a/libevmjit/Compiler.cpp b/libevmjit/Compiler.cpp index 1d00fd2252..6286ef92f2 100644 --- a/libevmjit/Compiler.cpp +++ b/libevmjit/Compiler.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/libevmjit/interface.cpp b/libevmjit/interface.cpp index 7f334fa14c..5d2b97c2d2 100644 --- a/libevmjit/interface.cpp +++ b/libevmjit/interface.cpp @@ -1,5 +1,5 @@ #include "interface.h" -#include +#include #include "ExecutionEngine.h" extern "C"